diff options
| author | Andrea Mondelli <Andrea.Mondelli@ucf.edu> | 2019-02-22 11:42:16 -0500 |
|---|---|---|
| committer | Andrea Mondelli <Andrea.Mondelli@ucf.edu> | 2019-02-23 03:15:59 +0000 |
| commit | f59e550bc8164a2a8d06bf18099f993c7181367c (patch) | |
| tree | 295737eceede637fe12c0bf14e55be51164e1d41 /SConstruct | |
| parent | 174ef8a73e384379f8f818d049bf5a1e0c1f349a (diff) | |
| download | gem5-f59e550bc8164a2a8d06bf18099f993c7181367c.tar.xz | |
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 <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'SConstruct')
| -rwxr-xr-x | SConstruct | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 026327c2c..5162c3dfb 100755 --- a/SConstruct +++ b/SConstruct @@ -1090,7 +1090,9 @@ def add_local_rpath(env, *targets): ] 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. |