Hello Andrea Mondelli,
I'd like you to do a code review. Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/15475
to review the following change.
Change subject: scons: added support of default Python installation on MacOS
......................................................................
scons: added support of default Python installation on MacOS
Recent MacOS versions are distributed with python 2.7.
This version of python is sufficient to compile and run gem5.
This patch allows to use the default python instead of the version provided
by third-party tools (e.g., brew)
The default MacOS LLDB debugger is linked against the default python
installation, which conflicts with Python framework provided by third-party
package systems.
This patch removes the need of gem5 to have multiple python installations
on MacOS, if not explicitly installed.
Change-Id: I98f24804149cb2e04ca432c66d2f57e0296af7b2
---
M SConstruct
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
index 0a8cd0e..279823e 100755
--- a/SConstruct
+++ b/SConstruct
@@ -712,7 +712,11 @@
exception='').split()
# Strip the -I from the include folders before adding them to the
# CPPPATH
- main.Append(CPPPATH=map(lambda inc: inc[2:], py_includes))
+ if len(filter(lambda x: x == '-iwithsysroot', py_includes)) > 0:
+ # Default MacOS Python
+ main.Append(CPPPATH=py_includes)
+ else:
+ main.Append(CPPPATH=map(lambda inc: inc[2:], py_includes))
# Read the linker flags and split them into libraries and other link
# flags. The libraries are added later through the call the CheckLib.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15475
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: I98f24804149cb2e04ca432c66d2f57e0296af7b2
Gerrit-Change-Number: 15475
Gerrit-PatchSet: 1
Gerrit-Owner: Andrea Mondelli <[email protected]>
Gerrit-Reviewer: Andrea Mondelli <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
