darwin.h (LINK_SYSROOT_SPEC): New.

	* config/darwin.h (LINK_SYSROOT_SPEC): New.
	(LINK_SPEC): If TARGET_SYSTEM_ROOT is defined, pass it to
	the linker by default.

From-SVN: r117158

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99adeb65c51a43bcc34d5d58bbf1ad0a963fb1bf..d8683fbd26ee2bca3c93423bce21fb8ee9a18cc9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-22  Geoffrey Keating  <geoffk@apple.com>
+
+       * config/darwin.h (LINK_SYSROOT_SPEC): New.
+       (LINK_SPEC): If TARGET_SYSTEM_ROOT is defined, pass it to
+       the linker by default.
+
 2006-09-22  Mike Stump  <mrs@apple.com>
 
        * config/rs6000/darwin.h (PROFILE_HOOK): Reassociate comment with

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 75623bbe3f2d26bc171ab6db0772b68aaa035046..328754e8aeeffd08b64bd6303fdb64653d7cee81 100644 (file)
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -214,6 +214,13 @@ extern GTY(()) int darwin_ms_struct;
     %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %G %L}} \
     %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} }}}}}}}}"
 
+#ifdef TARGET_SYSTEM_ROOT
+#define LINK_SYSROOT_SPEC \
+  "%{isysroot*:-syslibroot %*;:-syslibroot " TARGET_SYSTEM_ROOT "}"
+#else
+#define LINK_SYSROOT_SPEC "%{isysroot*:-syslibroot %*}"
+#endif
+
 /* Please keep the random linker options in alphabetical order (modulo
    'Z' and 'no' prefixes).  Options that can only go to one of libtool
    or ld must be listed twice, under both !Zdynamiclib and
@@ -282,7 +289,7 @@ extern GTY(()) int darwin_ms_struct;
    %{Zseg_addr_table*: -seg_addr_table %*} \
    %{Zfn_seg_addr_table_filename*:-seg_addr_table_filename %*} \
    %{sub_library*} %{sub_umbrella*} \
-   %{isysroot*:-syslibroot %*} \
+   " LINK_SYSROOT_SPEC " \
    %{twolevel_namespace} %{twolevel_namespace_hints} \
    %{umbrella*} \
    %{undefined*} \