diff options
| author | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-12-19 14:28:32 +0000 |
|---|---|---|
| committer | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-12-19 14:28:32 +0000 |
| commit | 00a05b87dcb115f560a0af989e19414098e949cd (patch) | |
| tree | efd4d81be89029c8445896e59cfcee4a71be814c /libgcc | |
| parent | 7707ba40efe59ddca97dcd88c31daeb336d2a562 (diff) | |
| download | gcc-00a05b87dcb115f560a0af989e19414098e949cd.tar.gz | |
2007-12-19 Etsushi Kato <ek.kato@gmail.com>
Paolo Bonzini <bonzini@gnu.org>
PR target/30572
* Makefile.in: Use @shlib_slibdir@ substitution to get correct install name
on darwin.
* config/t-slibgcc-darwin: Use @shlib_slibdir@ for -install_name.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131062 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 8 | ||||
| -rw-r--r-- | libgcc/Makefile.in | 4 | ||||
| -rw-r--r-- | libgcc/config/t-slibgcc-darwin | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index e38b757e6a1..d5481be95a7 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,11 @@ +2007-12-19 Etsushi Kato <ek.kato@gmail.com> + Paolo Bonzini <bonzini@gnu.org> + + PR target/30572 + * Makefile.in: Use @shlib_slibdir@ substitution to get correct install name + on darwin. + * config/t-slibgcc-darwin: Use @shlib_slibdir@ for -install_name. + 2007-12-15 Hans-Peter Nilsson <hp@axis.com> * config.host (crisv32-*-elf, crisv32-*-none): New, same as diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 60feaff768e..24894e6efe4 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -32,6 +32,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ libdir = @libdir@ +shlib_slibdir = @slibdir@ SHELL = @SHELL@ @@ -739,7 +740,8 @@ libgcc_s$(SHLIB_EXT): $(libgcc-s-objects) $(extra-parts) @shlib_objs@,$(objects),$(subst \ @shlib_base_name@,libgcc_s,$(subst \ @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_LINK))))))) + @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ + @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) # @multilib_flags@ is still needed because this may use diff --git a/libgcc/config/t-slibgcc-darwin b/libgcc/config/t-slibgcc-darwin index 507821d6030..d1e43119dfc 100644 --- a/libgcc/config/t-slibgcc-darwin +++ b/libgcc/config/t-slibgcc-darwin @@ -16,7 +16,7 @@ SHLIB_LC = -lc # Note that this version is used for the loader, not the linker; the linker # uses the stub versions named by the versioned members of $(INSTALL_FILES). SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \ - -install_name $(slibdir)/$(SHLIB_INSTALL_NAME) \ + -install_name @shlib_slibdir@/$(SHLIB_INSTALL_NAME) \ -single_module -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp \ -Wl,-exported_symbols_list,$(SHLIB_MAP) \ $(SHLIB_VERSTRING) \ |