diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-14 20:08:02 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-14 20:08:02 +0000 |
| commit | a42a57cb64a3b40856f3268dc3dfe424d152b469 (patch) | |
| tree | f04160bfd92b08fd9a9a2aab7e8e4597a3583925 /libobjc/configure.ac | |
| parent | 8329559d9e2495bd980454f28edbcb7d3188691a (diff) | |
| download | gcc-a42a57cb64a3b40856f3268dc3dfe424d152b469.tar.gz | |
configure.ac: Restore toolexecdir.
* configure.ac: Restore toolexecdir.
* Makefile.in: Restore toolexecdir.
* configure: Regenerate.
From-SVN: r80690
Diffstat (limited to 'libobjc/configure.ac')
| -rw-r--r-- | libobjc/configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libobjc/configure.ac b/libobjc/configure.ac index f58dafe2614..b0c86bd9282 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -125,19 +125,23 @@ gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` AC_SUBST(gcc_version) # Calculate toolexeclibdir +# Also toolexecdir, though it's only used in toolexeclibdir case ${version_specific_libs} in yes) # Need the gcc compiler version to know where to install libraries # and header files if --enable-version-specific-runtime-libs option # is selected. + toolexecdir='$(libdir)/gcc/$(target_noncanonical)' toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' ;; no) if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_noncanonical)' toolexeclibdir='$(toolexecdir)/lib' else + toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' toolexeclibdir='$(libdir)' fi multi_os_directory=`$CC -print-multi-os-directory` @@ -147,6 +151,7 @@ case ${version_specific_libs} in esac ;; esac +AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) # -------- |