| SConscript (5793:321f79ddb500) | SConscript (5797:0767f2b9524b) |
|---|---|
| 1# -*- mode:python -*- 2 3# Copyright (c) 2004-2005 The Regents of The University of Michigan 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 997 unchanged lines hidden (view full) --- 1006 1007 static_objs = make_objs(cc_lib_sources, new_env, static=True) 1008 shared_objs = make_objs(cc_lib_sources, new_env, static=False) 1009 static_objs += [ swig_env.StaticObject(s) for s in cc_swig_sources ] 1010 shared_objs += [ swig_env.SharedObject(s) for s in cc_swig_sources ] 1011 1012 # First make a library of everything but main() so other programs can 1013 # link against m5. | 1# -*- mode:python -*- 2 3# Copyright (c) 2004-2005 The Regents of The University of Michigan 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 997 unchanged lines hidden (view full) --- 1006 1007 static_objs = make_objs(cc_lib_sources, new_env, static=True) 1008 shared_objs = make_objs(cc_lib_sources, new_env, static=False) 1009 static_objs += [ swig_env.StaticObject(s) for s in cc_swig_sources ] 1010 shared_objs += [ swig_env.SharedObject(s) for s in cc_swig_sources ] 1011 1012 # First make a library of everything but main() so other programs can 1013 # link against m5. |
| 1014 static_lib = new_env.StaticLibrary(libname, static_objs + static_objs) 1015 shared_lib = new_env.SharedLibrary(libname, shared_objs + shared_objs) | 1014 static_lib = new_env.StaticLibrary(libname, static_objs) 1015 shared_lib = new_env.SharedLibrary(libname, shared_objs) |
| 1016 1017 for target, sources in unit_tests: 1018 objs = [ new_env.StaticObject(s) for s in sources ] 1019 new_env.Program("unittest/%s.%s" % (target, label), objs + static_lib) 1020 1021 # Now link a stub with main() and the static library. 1022 objects = [new_env.Object(s) for s in cc_bin_sources] + static_lib 1023 if strip: --- 58 unchanged lines hidden --- | 1016 1017 for target, sources in unit_tests: 1018 objs = [ new_env.StaticObject(s) for s in sources ] 1019 new_env.Program("unittest/%s.%s" % (target, label), objs + static_lib) 1020 1021 # Now link a stub with main() and the static library. 1022 objects = [new_env.Object(s) for s in cc_bin_sources] + static_lib 1023 if strip: --- 58 unchanged lines hidden --- |