Ciro Santilli has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/35995 )
Change subject: scons: make LDFLAGS_EXTRA take effect on partial links as
well
......................................................................
scons: make LDFLAGS_EXTRA take effect on partial links as well
Before this patch, it would only be added to the final link, but this is
not what I would expect from the option.
After this change this for example, the --gold-linker option could have
been implemented with LDFLAGS_EXTRA, since gold fails if the partial links
are done with ld and the final link with gold.
Change-Id: I8bbebf65afbff83b512defc879b518e87c64c348
---
M SConstruct
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
index 8e7ec34..81fdac0 100755
--- a/SConstruct
+++ b/SConstruct
@@ -332,6 +332,7 @@
main['PSHLINKFLAGS'] =
main.subst('${FILTER_PSHLINKFLAGS(SHLINKFLAGS)}')
if GetOption('gold_linker'):
main.Append(LINKFLAGS='-fuse-ld=gold')
+ main.Append(LINKFLAGS='$LDFLAGS_EXTRA')
main['PLINKFLAGS'] = main.get('LINKFLAGS')
shared_partial_flags = ['-r', '-nostdlib']
main.Append(PSHLINKFLAGS=shared_partial_flags)
@@ -1241,7 +1242,6 @@
env.Append(CCFLAGS=['-msse2'])
env.Append(CCFLAGS='$CCFLAGS_EXTRA')
- env.Append(LINKFLAGS='$LDFLAGS_EXTRA')
# The src/SConscript file sets up the build rules in 'env' according
# to the configured variables. It returns a list of environments,
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35995
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I8bbebf65afbff83b512defc879b518e87c64c348
Gerrit-Change-Number: 35995
Gerrit-PatchSet: 1
Gerrit-Owner: Ciro Santilli <ciro.santi...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
