From 9281e73dd6d9fd79c8542a62374ac530f3e97c78 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Fri, 22 Sep 2006 23:38:42 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/config/darwin.h | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 99adeb65c51..d8683fbd26e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-09-22 Geoffrey Keating + + * 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 * config/rs6000/darwin.h (PROFILE_HOOK): Reassociate comment with diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 75623bbe3f2..328754e8aee 100644 --- 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*} \ -- 2.30.2