Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40960 )
Change subject: scons: Include libthr on freebsd no matter what compiler
you're using.
......................................................................
scons: Include libthr on freebsd no matter what compiler you're using.
The compiler won't change where the thread library is implemented.
Change-Id: Ic6fbaae2ff9c4a91ce86b06d62049b9d9a0e3132
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40960
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Reviewed-by: B.A. Zeeb <ba...@cam.ac.uk>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M SConstruct
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
B.A. Zeeb: Looks good to me, but someone else must approve
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index bb523da..31f9902 100755
--- a/SConstruct
+++ b/SConstruct
@@ -305,15 +305,20 @@
# As gcc and clang share many flags, do the common parts here
main.Append(CCFLAGS=['-pipe'])
main.Append(CCFLAGS=['-fno-strict-aliasing'])
+
# Enable -Wall and -Wextra and then disable the few warnings that
# we consistently violate
main.Append(CCFLAGS=['-Wall', '-Wundef', '-Wextra',
'-Wno-sign-compare', '-Wno-unused-parameter'])
+
# We always compile using C++14
main.Append(CXXFLAGS=['-std=c++14'])
+
if sys.platform.startswith('freebsd'):
main.Append(CCFLAGS=['-I/usr/local/include'])
main.Append(CXXFLAGS=['-I/usr/local/include'])
+ # On FreeBSD we need libthr.
+ main.Append(LIBS=['thr'])
conf.CheckLinkFlag('-Wl,--as-needed')
if GetOption('gold_linker'):
@@ -386,10 +391,6 @@
main.Append(CXXFLAGS=['-stdlib=libc++'])
main.Append(LIBS=['c++'])
- # On FreeBSD we need libthr.
- if sys.platform.startswith('freebsd'):
- main.Append(LIBS=['thr'])
-
# Add sanitizers flags
sanitizers=[]
if GetOption('with_ubsan'):
13 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40960
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: Ic6fbaae2ff9c4a91ce86b06d62049b9d9a0e3132
Gerrit-Change-Number: 40960
Gerrit-PatchSet: 15
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: B.A. Zeeb <ba...@cam.ac.uk>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
