[cig-commits] commit: Updating to the same point as stgUnderworld.

[Mercurial]

changeset:   30:0957ae6cda39
user:        LukeHodkinson
date:        Thu Feb 14 23:34:01 2008 +0000
files:       StgSCons
description:
Updating to the same point as stgUnderworld.


diff -r cff250571157 -r 0957ae6cda39 StgSCons
--- a/StgSCons	Thu Feb 14 23:33:46 2008 +0000
+++ b/StgSCons	Thu Feb 14 23:34:01 2008 +0000
@@ -60,9 +60,9 @@ def build_library(env, objs, name, libs=
             dst, objs,
             SHLIBPREFIX='',
             LIBPREFIXES=[env['LIBPREFIXES']] + [''],
-	    LIBS=env['LIBS'] + libs)
+	    LIBS=libs + env.get('LIBS', []))
     else:
-        cur_node = env.SharedLibrary(dst, objs)
+        cur_node = env.SharedLibrary(dst, objs, LIBS=libs + env.get('LIBS', []))
     env.lib_nodes.append(cur_node)
 
 def build_tests(env, files, name, sup_objs=[], libs=None):
@@ -78,7 +78,7 @@ def build_tests(env, files, name, sup_ob
                            os.path.splitext(os.path.basename(src))[0])
         cur_node = env.Program(dst, [src] + sup_objs,
                                CPPDEFINES=env['CPPDEFINES'] + mod,
-                               LIBS=env['LIBS'] + l)
+                               LIBS=l + env.get('LIBS', []))
         nodes.append(cur_node)
 
 def build_directory(env, dir, extra_objs=[],