[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/files/

[Fabian Groffen]

commit:     b93602ba2a0f76a9a85cb36a1740a4522e45ce36
Author:     Michael Weiser <michael.weiser <AT> gmx <DOT> de>
AuthorDate: Wed Dec 27 21:36:35 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 14:54:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b93602ba

sys-devel/binutils-config: Use -rpath on Darwin

Extend ldwrapper to inject -rpath options into the linker command line
on darwin as well. Only do so if ld64 would not refuse to accept them.
This can happen if the output type doesn't support it (static, kext,
...) or the deployment target is unspecified or did not support -rpath
yet (< 10.5). The latter is not usually a problem since portage
(MACOSX_DEPLOYMENT_TARGET) and clang (-macosx_version_min) always set
the deployment target explicitly.

Signed-off-by: Michael Weiser <michael.weiser <AT> gmx.de>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-devel/binutils-config/files/ldwrapper.c | 79 ++++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 12 deletions(-)

diff --git a/sys-devel/binutils-config/files/ldwrapper.c b/sys-devel/binutils-config/files/ldwrapper.c
index a8f140be27..1ed11ce42d 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -205,8 +205,10 @@ main(int argc, char *argv[])
 	char ldbuf[ESIZ];
 	char *ld = ldbuf;
 	char ctarget[128];
+	char *darwin_dt = getenv("MACOSX_DEPLOYMENT_TARGET");
 	char is_cross = 0;
 	char is_darwin = 0;
+	char darwin_use_rpath = 1;
 	char is_aix = 0;
 	char *p;
 	size_t len;
@@ -287,18 +289,52 @@ main(int argc, char *argv[])
 				newargc++;
 			if (argv[i][1] == 'v' || argv[i][1] == 'V')
 				verbose = 1;
+			if (strcmp(argv[i], "-macosx_version_min") == 0 && i < argc - 1)
+				darwin_dt = argv[i + 1];
+			/* ld64 will refuse to accept -rpath if any of the
+			 * following options are given */
+			if (strcmp(argv[i], "-static") == 0 ||
+					strcmp(argv[i], "-dylinker") == 0 ||
+					strcmp(argv[i], "-preload") == 0 ||
+					strcmp(argv[i], "-r") == 0 ||
+					strcmp(argv[i], "-kext") == 0)
+				darwin_use_rpath = 0;
 		}
 	}
-	/* account the original arguments */
-	newargc += argc;
-	/* we always add a sentinel */
-	newargc++;
+
+	/* Note: Code below assumes that newargc is the count of -L arguments. */
 
 	/* If a package being cross-compiled injects standard directories, it's
 	 * non-cross-compilable on any platform, prefix or no prefix. So no
 	 * need to add PREFIX- or CTARGET-aware libdirs. */
 	if (!is_cross) {
 		if (is_darwin) {
+			/* check deployment target if nothing prevents us from
+			 * using -rpath as of yet
+			 * # ld64 -rpath foo
+			 * ld: -rpath can only be used when targeting Mac OS X
+			 * 10.5 or later */
+			if (darwin_use_rpath) {
+				/* version format is x.y.z. atoi will stop
+				 * parsing at dots. darwin_dt != NULL isn't
+				 * just for safety: ld64 also refuses -rpath
+				 * when not given a deployment target at all */
+				darwin_use_rpath = darwin_dt != NULL &&
+					(atoi(darwin_dt) > 10 ||
+					 (strncmp(darwin_dt, "10.", 3) == 0 &&
+					  atoi(darwin_dt + 3) >= 5));
+			}
+
+			if (darwin_use_rpath) {
+				/* We need two additional arguments for each:
+				 * -rpath and the path itself */
+				newargc *= 2;
+
+				/* and we will be adding two for the each of
+				 * the two system paths as well */
+				newargc += 4;
+			}
+
 			/* add the 2 prefix paths (-L) and -search_paths_first */
 			newargc += 2 + 1;
 		} else {
@@ -312,6 +348,11 @@ main(int argc, char *argv[])
 		}
 	}
 
+	/* account the original arguments */
+	newargc += argc;
+	/* we always add a sentinel */
+	newargc++;
+
 	/* let's first try to find the real ld */
 	if (find_real_ld(&ld, sizeof(ldbuf), verbose, is_cross,
 				wrapper, ctarget) != 0)
@@ -358,7 +399,7 @@ main(int argc, char *argv[])
 
 		newargv[j] = argv[i];
 
-		if (is_cross || is_darwin)
+		if (is_cross || (is_darwin && !darwin_use_rpath))
 			continue;
 
 		/* on ELF targets we add runpaths for all found search paths */
@@ -390,14 +431,21 @@ main(int argc, char *argv[])
 			if (builddir != NULL && strncmp(builddir, path, len) != 0)
 				continue;
 
-			sze = 2 + strlen(path) + 1;
-			newargv[k] = malloc(sizeof(char) * sze);
-			if (newargv[k] == NULL) {
-				fprintf(stderr, "%s: failed to allocate memory for "
-						"'%s' -R argument\n", wrapper, argv[i]);
-				exit(1);
+			if (is_darwin) {
+				newargv[k] = "-rpath";
+				newargv[++k] = path;
+			} else {
+				sze = 2 + strlen(path) + 1;
+				newargv[k] = malloc(sizeof(char) * sze);
+				if (newargv[k] == NULL) {
+					fprintf(stderr, "%s: failed to allocate memory for "
+							"'%s' -R argument\n", wrapper, argv[i]);
+					exit(1);
+				}
+
+				snprintf(newargv[k], sze, "-R%s", path);
 			}
-			snprintf(newargv[k], sze, "-R%s", path);
+
 			k++;
 		}
 	}
@@ -407,6 +455,13 @@ main(int argc, char *argv[])
 			/* FIXME: no support for cross-compiling *to* Darwin */
 			newargv[k++] = "-L" EPREFIX "/usr/lib";
 			newargv[k++] = "-L" EPREFIX "/lib";
+
+			if (darwin_use_rpath) {
+				newargv[k++] = "-rpath";
+				newargv[k++] = EPREFIX "/usr/lib";
+				newargv[k++] = "-rpath";
+				newargv[k++] = EPREFIX "/lib";
+			}
 		} else {
 			newargv[k++] = "-L" EPREFIX "/usr/" CHOST "/lib/gcc";
 			newargv[k++] = "-R" EPREFIX "/usr/" CHOST "/lib/gcc";