Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40869 )
Change subject: scons: Merge redundant checks for the socket library.
......................................................................
scons: Merge redundant checks for the socket library.
scons can accept more than one library at a time, so lets check for both
at once instead of writing out almost the same check twice.
Change-Id: I82f9bdf59a349e28ca75a615d711051256ec73a4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40869
Tested-by: kokoro <[email protected]>
Maintainer: Gabe Black <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
---
M SConstruct
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index d0fd852..09029f6 100755
--- a/SConstruct
+++ b/SConstruct
@@ -588,10 +588,9 @@
warning('Python version too new. Python 3 expected.')
# On Solaris you need to use libsocket for socket ops
-if not
conf.CheckLibWithHeader(None, 'sys/socket.h', 'C++', 'accept(0,0,0);'):
- if not conf.CheckLibWithHeader('socket', 'sys/socket.h',
- 'C++', 'accept(0,0,0);'):
- error("Can't find library with socket calls (e.g. accept()).")
+if not conf.CheckLibWithHeader(
+ [None, 'socket'], 'sys/socket.h', 'C++', 'accept(0,0,0);'):
+ error("Can't find library with socket calls (e.g. accept()).")
# Check for zlib. If the check passes, libz will be automatically
# added to the LIBS environment variable.
The change was submitted with unreviewed changes in the following files:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40869
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: I82f9bdf59a349e28ca75a615d711051256ec73a4
Gerrit-Change-Number: 40869
Gerrit-PatchSet: 8
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
