changeset e6fabe023fe1 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=e6fabe023fe1
description:
scons: Separate swig environment so we can have different flags.
Swig code isn't quite perfect, so let's not turn on all of the warnings.
diffstat:
0 files changed
diffs (40 lines):
diff -r de0fa35df4cb -r e6fabe023fe1 src/SConscript
--- a/src/SConscript Mon Sep 22 08:25:57 2008 -0700
+++ b/src/SConscript Mon Sep 22 08:25:58 2008 -0700
@@ -543,6 +543,7 @@
# Build all swig modules
swig_modules = []
+cc_swig_sources = []
for source,package in swig_sources:
filename = str(source)
assert filename.endswith('.i')
@@ -559,7 +560,7 @@
env.Depends(cc_file, source)
swig_modules.append(Value(module))
- Source(cc_file)
+ cc_swig_sources.append(File(cc_file))
PySource(package, py_file)
# Generate the main swig init file
@@ -945,12 +946,18 @@
newEnv.Label = label
newEnv.Append(**kwargs)
+ swig_env = newEnv.Copy()
+ swig_env.Append(CCFLAGS='-Wno-uninitialized')
+ swig_objs = [ swig_env.Object(s) for s in cc_swig_sources ]
+
# First make a library of everything but main() so other programs can
# link against m5.
#
# SCons doesn't know to append a library suffix when there is a '.' in the
# name. Use '_' instead.
- m5lib = newEnv.Library('m5_' + label, make_objs(cc_lib_sources, newEnv))
+
+ m5lib = newEnv.Library('m5_' + label,
+ make_objs(cc_lib_sources, newEnv) + swig_objs)
# Now link a stub with main() and the library.
exe = 'm5.' + label # final executable
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
