diff options
author | Iain Sandoe <iain@sandoe.co.uk> | 2024-01-08 17:00:18 +0000 |
---|---|---|
committer | Iain Sandoe <iain@sandoe.co.uk> | 2024-01-18 14:22:16 +0000 |
commit | 49478485f23d1b1645201ba4d3fc83a6c2852a3d (patch) | |
tree | 445d99a8b58a070d687b76364734dbb4e06e414d | |
parent | 8d26636f0da31e6c17b57ced52bfc61a45f23cee (diff) | |
download | gcc-49478485f23d1b1645201ba4d3fc83a6c2852a3d.zip gcc-49478485f23d1b1645201ba4d3fc83a6c2852a3d.tar.gz gcc-49478485f23d1b1645201ba4d3fc83a6c2852a3d.tar.bz2 |
Darwin: Suppress adding embedded rpaths for earlier OS versions.
When we have @rpath support by virtue of the OS version we're hosting on
we still need to omit those rpath entries when targeting < 10.5 (or the
linker will complain). To do this we (maybe ab-)use a property of the
spec function expansion that a non-null return value can be used as the
true input to a second spec (whereas, unfortunately, we cannot pass specs
to the version function at present).
gcc/ChangeLog:
* config/darwin.h (DARWIN_RPATH_SPEC): Arrange for the %P spec
to be conditional on macosx-version-min.
Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
-rw-r--r-- | gcc/config/darwin.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index e94a29c..cb96d67 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -612,8 +612,7 @@ extern GTY(()) int darwin_ms_struct; director as one being loaded. */ #define DARWIN_RPATH_SPEC \ "%:version-compare(>= 10.5 mmacosx-version-min= -rpath) \ - %:version-compare(>= 10.5 mmacosx-version-min= @loader_path) \ - %P " + %{%:version-compare(>= 10.5 mmacosx-version-min= @loader_path): %P }" #else #define DARWIN_RPATH_SPEC "" #endif |