Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/16888 )
Change subject: scons: fix disable_partial logic for fast binary
......................................................................
scons: fix disable_partial logic for fast binary
Partial linking should be disabled on darwin; however, the script
fails to do so when force_lto is set, which results in gem5 building
with fast option fails on macOS. This fix changes disable_partial
logic, which should be True once it's True.
Signed-off-by: Hoa Nguyen <[email protected]>
Change-Id: I77d2a4cc4a9bf5c92c800c004eb744bb7081c42e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/16888
Reviewed-by: Gabe Black <[email protected]>
Reviewed-by: Nikos Nikoleris <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
---
M src/SConscript
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved
Gabe Black: Looks good to me, but someone else must approve
Jason Lowe-Power: Looks good to me, approved
diff --git a/src/SConscript b/src/SConscript
index 1d65649..d21feea 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1388,9 +1388,9 @@
# "Fast" binary
if 'fast' in needed_envs:
- disable_partial = disable_partial and \
- env.get('BROKEN_INCREMENTAL_LTO', False) and \
- GetOption('force_lto')
+ disable_partial = disable_partial or \
+ (env.get('BROKEN_INCREMENTAL_LTO', False) and \
+ GetOption('force_lto'))
makeEnv(env, 'fast', '.fo', strip = True,
CCFLAGS = Split(ccflags['fast']),
CPPDEFINES = ['NDEBUG', 'TRACING_ON=0'],
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/16888
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I77d2a4cc4a9bf5c92c800c004eb744bb7081c42e
Gerrit-Change-Number: 16888
Gerrit-PatchSet: 2
Gerrit-Owner: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
