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 27ad56397063d705d91b6e42319b886799e68013..894a08df9e1610363c8d4830762e02a170b2329d 100644 (file)
--- 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)