From: Iain Sandoe <iain@sandoe.co.uk>
Date: Mon, 8 Jan 2024 17:00:18 +0000 (+0000)
Subject: Darwin: Suppress adding embedded rpaths for earlier OS versions.
X-Git-Tag: basepoints/gcc-15~1898
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49478485f23d1b1645201ba4d3fc83a6c2852a3d;p=thirdparty%2Fgcc.git

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>
---

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index e94a29c639cb..cb96d67b3b1b 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