From: Nathan Binkert <nate@binkert.org>
Date: Sat, 13 Jun 2009 04:19:16 +0000 (-0700)
Subject: scons: Make shared library builds work again
X-Git-Tag: Calvin_Submission~277
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1eacc8d92498f29a43b427e314c95798d70a080;p=gem5.git

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 c8432ae15..b93f5e361 100644
--- 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 42e002310..d96922b49 100644
--- 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.