diff options
| author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-28 01:44:38 +0000 |
|---|---|---|
| committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-28 01:44:38 +0000 |
| commit | 0a5184b0a66ddb1f876ef992c8bd1befd7b3e754 (patch) | |
| tree | 70d0aa4590cd799b67d7c7983f9c82595d37d5d8 /libf2c/aclocal.m4 | |
| parent | 071fa37b15925a67f66adf4edb226b86ecade3eb (diff) | |
| download | gcc-0a5184b0a66ddb1f876ef992c8bd1befd7b3e754.tar.gz | |
* Makefile.in ($(LIBG2C)): -rpath is glibcpp_toolexeclibdir.
* aclocal.m4 (glibcpp_toolexeclibdir): Instead of
$(MULTISUBDIR), use `$CC -print-multi-os-directory`, unless
version_specific_libs is enabled.
* configure: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61927 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libf2c/aclocal.m4')
| -rw-r--r-- | libf2c/aclocal.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libf2c/aclocal.m4 b/libf2c/aclocal.m4 index b7d61e3c5a0..5d39edcfcbe 100644 --- a/libf2c/aclocal.m4 +++ b/libf2c/aclocal.m4 @@ -207,11 +207,12 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi AC_SUBST(glibcpp_prefixdir) |