Andrea Mondelli has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/16649 )
Change subject: scons: conditional use of new RPATH inclusion
......................................................................
scons: conditional use of new RPATH inclusion
On OSX, clang doesn’t support the -z option.
This patch resolve the compiler error produced on MacOS platform.
Change-Id: Idfe69c30fe40add97d16d0f2e25e598b30d26a9d
Reviewed-on: https://gem5-review.googlesource.com/c/16649
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M SConstruct
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/SConstruct b/SConstruct
index 026327c..5162c3d 100755
--- a/SConstruct
+++ b/SConstruct
@@ -1090,7 +1090,9 @@
]
env.Append(RPATH=[env.Literal(os.path.join(*components))])
-main.Append(LINKFLAGS=Split('-z origin'))
+if sys.platform != "darwin":
+ main.Append(LINKFLAGS=Split('-z origin'))
+
main.AddMethod(add_local_rpath, 'AddLocalRPATH')
# builds in ext are shared across all configs in the build root.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/16649
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: Idfe69c30fe40add97d16d0f2e25e598b30d26a9d
Gerrit-Change-Number: 16649
Gerrit-PatchSet: 3
Gerrit-Owner: Andrea Mondelli <[email protected]>
Gerrit-Reviewer: Andrea Mondelli <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-CC: Jason Lowe-Power <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
