Nikos Nikoleris has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/14818 )
Change subject: scons: Disable systemc on Mac OS
......................................................................
scons: Disable systemc on Mac OS
LLVM on Mac OS up until version 10.0.0 doesn't seem to support the
attribute for weak linking and fails to compile. Additionally, even
the basic example tests fail. Therefore, this change disables systemc
by default on Mac OS until we address these issues.
Change-Id: Iaa6360ec61317e01f4e645af8b509961b3144282
Signed-off-by: Nikos Nikoleris <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/14818
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/SConscript
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/SConscript b/src/systemc/SConscript
index 7317b3a..c820b45 100644
--- a/src/systemc/SConscript
+++ b/src/systemc/SConscript
@@ -31,12 +31,17 @@
from m5.util.terminal import termcap
if env['USE_SYSTEMC']:
- if 'GCC_VERSION' in env and \
- compareVersions(env['GCC_VERSION'], '5.0') < 0:
+ if ('GCC_VERSION' in env and \
+ compareVersions(env['GCC_VERSION'], '5.0') < 0) or \
+ env['PLATFORM'] == 'darwin':
- print(termcap.Yellow + termcap.Bold +
- 'Warning: Disabling systemc on gcc versions less than
5.0.' +
- termcap.Normal)
+ if env['PLATFORM'] == 'darwin':
+ print(termcap.Yellow + termcap.Bold +
+ 'Warning: Disabling systemc on Mac OS.' + termcap.Normal)
+ else:
+ print(termcap.Yellow + termcap.Bold +
+ 'Warning: Disabling systemc on gcc versions less than
5.0.' +
+ termcap.Normal)
env['USE_SYSTEMC'] = False
Return()
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/14818
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: Iaa6360ec61317e01f4e645af8b509961b3144282
Gerrit-Change-Number: 14818
Gerrit-PatchSet: 4
Gerrit-Owner: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-CC: Giacomo Travaglini <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
