[cig-commits] commit: Updating.

[Mercurial]

changeset:   33:088ad06a6de6
user:        LukeHodkinson
date:        Fri Feb 15 00:52:35 2008 +0000
files:       SConsUtils
description:
Updating.


diff -r 991548e58ca4 -r 088ad06a6de6 SConsUtils
--- a/SConsUtils	Fri Feb 15 00:28:15 2008 +0000
+++ b/SConsUtils	Fri Feb 15 00:52:35 2008 +0000
@@ -524,7 +524,7 @@ return 0;
         state.enable(ctx.env)
         res = ctx.TryRun(src, '.c')
         state.disable(ctx.env)
-        if not res:
+        if not res[0]:
             return res
 
         if self.require_shared:
@@ -576,7 +576,9 @@ return 0;
         # Build the program and try to run, but make sure the symbols are
         # passed to the linker out of order.
         state.enable(env)
-        old = env.push_state({'LIBS': [lib]}, append=True)
+        old = env.push_state({'LIBS': [lib],
+                              'RPATH': [os.getcwd()]},
+                             append=True)
         res = ctx.TryRun(main_src, '*.c')
         env.pop_state(old)
         state.disable(env)