christoph/fail
1
Fork 0
Code Releases Activity

gem5/cmake: gem5 build integration into Fail*

Browse Source 
The SConscript in src/core/sal/gem5 is now generated via CMake
(SConscript.in).  No more hardcoded relative paths -> Fail* build
folder can now be anywhere.  Experiment and Plugin libraries are now
set automagically (using ${EXPERIMENTS_ACTIVATED} /
${PLUGINS_ACTIVATED})

Generated SConscript now resides in binary dir.

Change-Id: I1bf2e17c83c95ffdcf6801c02481064fcb63bfb0
This commit is contained in:
Martin Hoffmann
2013-05-23 18:37:22 +02:00
committed by Horst Schirmeier
parent e006c4da0a
commit a3cbb7c690
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/sal/gem5/SConscript → src/core/sal/gem5/SConscript.in
View File

@ -3,13 +3,13 @@ Import('*')
if env['TARGET_ISA'] == 'no':
Return()
env.Prepend(CPPPATH=Dir('../../../../../src/core/'))
env.Prepend(CPPPATH=Dir('../../../../../build/src/core/'))
env.Prepend(CPPPATH=Dir('${PROJECT_SOURCE_DIR}/src/core/'))
env.Prepend(CPPPATH=Dir('${PROJECT_BINARY_DIR}/src/core/'))
env.Append(CXXFLAGS = '-Wno-deprecated')
env.Prepend(LIBPATH=Dir('../../../../../build/lib/'))
gStaticLibs = ['-lfail-sal', '-lfail-arch-test', '-lfail-comm', '-lfail-cpn', '-lfail-efw', '-lfail-util', '-lpcl', '-lprotobuf']
env.Prepend(LIBPATH=Dir('${LIBRARY_OUTPUT_PATH}'))
gStaticLibs = [${additional_libs} '-lfail-sal', '-lfail-comm', '-lfail-cpn', '-lfail-efw', '-lfail-util', '-lpcl', '-lprotobuf', '-liberty']
if (len(gStaticLibs)>0):
linkFlags = ['-Wl,--start-group']
@ -25,4 +25,4 @@ if (len(gStaticLibs)>0):
DebugFlag('FailState')
CompoundFlag('Fail', ['FailState'])
Source('Gem5Wrapper.cc')
Source(${GEM5_SAL_SRCS})