scons: Make shared library builds work again

Compile gzstream as position independent code
use the PIC version of date for shared libs...oops

diff --git a/ext/gzstream/SConscript b/ext/gzstream/SConscript
index c8432ae153cf22d9ad496d51a168175d7661c23b..b93f5e361af9cb7ba122f871d25f63f8d7bfa228 100644 (file)
--- a/ext/gzstream/SConscript
+++ b/ext/gzstream/SConscript
@@ -30,7 +30,7 @@
 
 Import('main')
 
-main.Library('gzstream', [File('gzstream.cc')])
+main.Library('gzstream', [main.SharedObject('gzstream.cc')])
 
 main.Prepend(CPPPATH=Dir('.'))
 main.Append(LIBS=['gzstream'])

diff --git a/src/SConscript b/src/SConscript
index 42e002310b049a0b8ec01a2f1124c8f001a2a270..d96922b49e3c919e8eb460095ca2156adeb4c73d 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -984,7 +984,7 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
     static_objs.append(static_date)
     
     shared_date = make_obj(date_source, static=False, extra_deps=shared_objs)
-    shared_objs.append(static_date)
+    shared_objs.append(shared_date)
 
     # First make a library of everything but main() so other programs can
     # link against m5.