From: Nathan Binkert <nate@binkert.org>
Date: Tue, 10 Feb 2009 04:10:12 +0000 (-0800)
Subject: scons: Don't build the intermediate static library unless explicitly requested.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e268ae63fe61c2365447d0df6baa351751cacb7;p=gem5.git

scons: Don't build the intermediate static library unless explicitly requested.
This means that similar to libm5_fast.so, you need to explicitly build
build/ALPHA_SE/libm5_fast.a if you want it.
---

diff --git a/src/SConscript b/src/SConscript
index 27ad56397..894a08df9 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -992,10 +992,10 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
 
     for target, sources in unit_tests:
         objs = [ new_env.StaticObject(s) for s in sources ]
-        new_env.Program("unittest/%s.%s" % (target, label), objs + static_lib)
+        new_env.Program("unittest/%s.%s" % (target, label), objs + static_objs)
 
     # Now link a stub with main() and the static library.
-    objects = [new_env.Object(s) for s in cc_bin_sources] + static_lib
+    objects = [new_env.Object(s) for s in cc_bin_sources] + static_objs
     if strip:
         unstripped_exe = exename + '.unstripped'
         new_env.Program(unstripped_exe, objects)