diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-04-17 11:47:21 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-04-17 11:47:21 +0200 |
| commit | 5c6a45596c57b3860e8e28483acc2705928a9109 (patch) | |
| tree | bfe74acb5787394bb75ec3ca8e5f121e3a73e753 /gcc | |
| parent | 92234f460e6fe6d4f2890beb423a4e7d9d855adf (diff) | |
| download | gcc-5c6a45596c57b3860e8e28483acc2705928a9109.zip gcc-5c6a45596c57b3860e8e28483acc2705928a9109.tar.gz gcc-5c6a45596c57b3860e8e28483acc2705928a9109.tar.bz2 | |
Adjust previous check-in, which set the wrong install_name for libgnarl
under Darwin.
From-SVN: r146233
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 8033834..ac0ae4c 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1887,8 +1887,7 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) EH_MECHANISM=-gcc GNATLIB_SHARED = gnatlib-shared-darwin - SO_OPTS = -Wl,-flat_namespace -shared-libgcc \ - -Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) + SO_OPTS = -Wl,-flat_namespace -shared-libgcc RANLIB = ranlib -c GMEM_LIB = gmemlib PREFIX_OBJS=$(PREFIX_REAL_OBJS) @@ -2286,11 +2285,13 @@ gnatlib-shared-darwin: -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ $(SO_OPTS) \ + -Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ $(MISCLIB) -lm cd $(RTSDIR); ../../xgcc -B../../ -dynamiclib $(TARGET_LIBGCC2_CFLAGS) \ -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ $(GNATRTL_TASKING_OBJS) \ $(SO_OPTS) \ + -Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ libgnat$(soext) |