Gabe Black has uploaded this change for review. ( 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
---
M SConstruct
1 file changed, 5 insertions(+), 4 deletions(-)



diff --git a/SConstruct b/SConstruct
index 706653b..b41ae6e 100755
--- a/SConstruct
+++ b/SConstruct
@@ -308,15 +308,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'):
@@ -384,10 +389,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'):

--
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: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

Reply via email to