diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-22 23:38:42 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-22 23:38:42 +0000 |
| commit | 0f4f6f1cb3db9ffff69532d100ea7ce90cb1674d (patch) | |
| tree | a31dfa65c8e0855063a828f3956c0c8469fc7bb5 /gcc | |
| parent | 32bca58b5eda518bc1742ea7498b4482d762c100 (diff) | |
| download | gcc-0f4f6f1cb3db9ffff69532d100ea7ce90cb1674d.tar.gz | |
* config/darwin.h (LINK_SYSROOT_SPEC): New.
(LINK_SPEC): If TARGET_SYSTEM_ROOT is defined, pass it to
the linker by default.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117158 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 9 |
2 files changed, 14 insertions, 1 deletions
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 <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 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*} \ |