diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-06-12 21:19:16 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-06-12 21:19:16 -0700 |
| commit | e1eacc8d92498f29a43b427e314c95798d70a080 (patch) | |
| tree | 9c975acdccca1909f1e8fcab9fc47a9577d19193 | |
| parent | d3d8a5a83beee58b4e4398ab18ff729bee072bd5 (diff) | |
| download | gem5-e1eacc8d92498f29a43b427e314c95798d70a080.tar.xz | |
scons: Make shared library builds work again
Compile gzstream as position independent code
use the PIC version of date for shared libs...oops
| -rw-r--r-- | ext/gzstream/SConscript | 2 | ||||
| -rw-r--r-- | src/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
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. |