aboutsummaryrefslogtreecommitdiff
path: root/config.if
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2003-01-30 11:52:51 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2003-01-30 11:52:51 +0000
commita693735b841b0228abc8e9eda50628d3d86381ae (patch)
treeb75b38364e9f3474086c26670a715cda214575ee /config.if
parent14d22dd6675f2225b5de7c0e591893f84fb6b9e0 (diff)
downloadgcc-a693735b841b0228abc8e9eda50628d3d86381ae.zip
gcc-a693735b841b0228abc8e9eda50628d3d86381ae.tar.gz
gcc-a693735b841b0228abc8e9eda50628d3d86381ae.tar.bz2
config.if: If gcc_version is already set, just use it.
* config.if: If gcc_version is already set, just use it. Don't set gcc_version_trigger if it's already set, otherwise set it to gcc/version.c, but only if the file exists. If it is not set and gcc/version.c does not exist, try to extract the version number from $CC. From-SVN: r62131
Diffstat (limited to 'config.if')
-rw-r--r--config.if15
1 files changed, 12 insertions, 3 deletions
diff --git a/config.if b/config.if
index aa35a3f..c38b59c 100644
--- a/config.if
+++ b/config.if
@@ -22,9 +22,18 @@ fi
# Set libstdcxx_incdir.
# This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4.
-gcc_version_trigger=${if_topsrcdir}/gcc/version.c
-gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'`
-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+if test -z "$gcc_version"; then
+ if test -z "${gcc_version_trigger}" \
+ && test -f ${if_topsrcdir}/gcc/version.c; then
+ gcc_version_trigger=${if_topsrcdir}/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/'`
+fi
libstdcxx_incdir=c++/${gcc_version}
# The trickiest part is libc_interface.