From 2384fa2601f07d3a398f730900f063160b33c146 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 16 Apr 2012 23:02:35 +0000
Subject: [PATCH] osx: do not enforce flat namespace in copy mode on OS X.

---
 src/myfork.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/myfork.c b/src/myfork.c
index e2b4f22..2855c29 100644
--- a/src/myfork.c
+++ b/src/myfork.c
@@ -150,7 +150,9 @@ static int run_process(struct child *child, struct opts *opts, int pipes[][2])
 #   if defined __APPLE__
 #       define EXTRAINFO ""
 #       define PRELOAD "DYLD_INSERT_LIBRARIES"
-    setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1);
+    /* Only enforce flat namespace in preload mode */
+    if (opts->opmode == OPMODE_PRELOAD)
+        setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1);
 #   elif defined __osf__
 #       define EXTRAINFO ":DEFAULT"
 #       define PRELOAD "_RLD_LIST"