about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2009-09-23T18·04+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2009-09-23T18·04+0000
commit676e07902e175666208b5c644ed8427f7684d3d9 (patch)
treea14cb1b114e52f7358d02d53b808028e856f44f8
parent64e89980e880826fec3e973e50edebf24278c7b8 (diff)
* Darwin hack.
-rw-r--r--src/libstore/local-store.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index e91a2559b168..6193792118bf 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -518,6 +518,13 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter &
 
     case 0: /* child */
         try {
+            /* Hack to let "make check" succeed on Darwin.  The
+               libtool wrapper script sets DYLD_LIBRARY_PATH to our
+               libutil (among others), but Perl also depends on a
+               library named libutil.  As a result, substituters
+               written in Perl (i.e. all of them) fail. */
+            unsetenv("DYLD_LIBRARY_PATH");
+            
             fromPipe.readSide.close();
             toPipe.writeSide.close();
             if (dup2(toPipe.readSide, STDIN_FILENO) == -1)