diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 9 | ||||
| -rw-r--r-- | config/gcc-version.m4 | 28 | ||||
| -rw-r--r-- | config/gxx-include-dir.m4 | 6 |
3 files changed, 12 insertions, 31 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 809396b..8572384 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,12 @@ +2005-03-21 Zack Weinberg <zack@codesourcery.com> + + * gxx-include-dir.m4: In all substitutions, leave $(gcc_version) + to be expanded by the Makefile. + +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * gcc-version.m4: Delete. + 2005-02-28 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 diff --git a/config/gcc-version.m4 b/config/gcc-version.m4 deleted file mode 100644 index 8de74bb..0000000 --- a/config/gcc-version.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl Usage: TL_AC_GCC_VERSION(TOPSRCDIR) -dnl -dnl Set up the variables: -dnl -dnl gcc_version_trigger: pathname of gcc's version.c, if available -dnl gcc_version_full: full gcc version string -dnl gcc_version: the first "word" in $gcc_version_full -dnl -dnl TOPSRCDIR is the top-level source directory. -AC_DEFUN([TL_AC_GCC_VERSION], -[ -changequote(,)dnl -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$1/gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` -changequote([,])dnl -AC_SUBST(gcc_version_trigger) -AC_SUBST(gcc_version_full) -AC_SUBST(gcc_version) -])dnl diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4 index 87a65ad..0e6e4ff 100644 --- a/config/gxx-include-dir.m4 +++ b/config/gxx-include-dir.m4 @@ -14,10 +14,10 @@ case "${with_gxx_include_dir}" in ;; no | "") case "${enable_version_specific_runtime_libs}" in - yes) gxx_include_dir='${libsubdir}/include/c++' ;; + yes) gxx_include_dir='$(libsubdir)/include/c++' ;; *) - libstdcxx_incdir=c++/${gcc_version} - gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; + libstdcxx_incdir='c++/$(gcc_version)' + gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;; esac ;; *) gxx_include_dir=${with_gxx_include_dir} ;; esac |