From: Hoa Nguyen <hoanguyen@ucdavis.edu>
Date: Fri, 1 Mar 2019 01:51:51 +0000 (-0800)
Subject: scons: fix disable_partial logic for fast binary
X-Git-Tag: v19.0.0.0~1042
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a28a4f8d2ac1471ef3ba943fa5f52a2331759bf;p=gem5.git

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>
---

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'],