christoph/fail
1
Fork 0
Code Releases Activity

Fixed linking problems for gem5:

Browse Source 
- The right libutil is now used
 - Static libraries from Fail* are now surrounded by --start-group and --end-group

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1513 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
friemel
2012-08-27 20:34:31 +00:00
parent 2df24babbb
commit 56a7c2b57b
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/sal/gem5/SConscript
View File

@ -3,11 +3,21 @@ Import('*')
if env['TARGET_ISA'] == 'no':
Return()
env.Append(CPPPATH=Dir('../../../../../src/core/'))
env.Append(CPPPATH=Dir('../../../../../build/src/core/'))
env.Prepend(CPPPATH=Dir('../../../../../src/core/'))
env.Prepend(CPPPATH=Dir('../../../../../build/src/core/'))
env.Append(LIBPATH=Dir('../../../../../build/lib/'))
env.Append(LIBS=['sal', 'comm', 'cpn', 'efw', 'util', 'pcl', 'hsc-simple'])
env.Prepend(LIBPATH=Dir('../../../../../build/lib/'))
gStaticLibs = ['-lsal', '-lhsc-simple', '-lcomm', '-lcpn', '-lefw', '-lutil', '-lpcl']
if (len(gStaticLibs)>0):
linkFlags = ['-Wl,--start-group']
linkFlags = linkFlags+gStaticLibs
linkFlags = linkFlags+['-Wl,--end-group']
env['GEN_LIB_BUILD_STATIC'] = linkFlags
env.Append(SHLINKCOM = ' $GEN_LIB_BUILD_STATIC')
env.Append(LINKCOM = ' $GEN_LIB_BUILD_STATIC')
SimObject('FailGem5Device.py')