diff options
| author | Hoa Nguyen <hoanguyen@ucdavis.edu> | 2019-02-28 17:51:51 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-03-18 22:22:25 +0000 |
| commit | 2a28a4f8d2ac1471ef3ba943fa5f52a2331759bf (patch) | |
| tree | e1848c7026e79c1edfe56cae363ca9728fd94e8b | |
| parent | eba0a509d80182c479e41d28bf71d3061f18590b (diff) | |
| download | gem5-2a28a4f8d2ac1471ef3ba943fa5f52a2331759bf.tar.xz | |
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 <hoanguyen@ucdavis.edu>
Change-Id: I77d2a4cc4a9bf5c92c800c004eb744bb7081c42e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/16888
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
| -rw-r--r-- | src/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/SConscript b/src/SConscript index 1d65649f8..d21feeac9 100644 --- a/src/SConscript +++ b/src/SConscript @@ -1388,9 +1388,9 @@ if 'opt' in needed_envs: # "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'], |