diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-05-09 00:31:01 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-05-09 00:31:01 +0000 |
| commit | b5d75b8618bd0a9cde51af1f3f48a3d124b23d01 (patch) | |
| tree | f15821762014136c89a81694aa5c1a0a529bf6b0 | |
| parent | e7fd553b3be8b95dc0946cd3267bc2db859cd3d8 (diff) | |
Use the -dumpversion option to llvm-gcc which gives us just the version #
and is unlikely to change in future releases. This also simplifies the
parsing of the full and major llvm-gcc version numbers in the script.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28180 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index a75300035c..3917db0a10 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -619,7 +619,7 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then AC_SUBST(LLVMCC1PLUS,$llvmcc1pluspath) llvmgccdir=`echo "$llvmcc1path" | sed 's,/libexec/.*,,'` AC_SUBST(LLVMGCCDIR,$llvmgccdir) - llvmgccversion=[`"$LLVMGCC" -v 2>&1 | grep '^gcc version' | sed 's/^gcc version \([0-9.]*\).*/\1/'`] + llvmgccversion=[`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'`] llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`] AC_SUBST(LLVMGCC_VERSION,$llvmgccversion) AC_SUBST(LLVMGCC_MAJVERS,$llvmgccmajvers) @@ -30725,7 +30725,7 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then llvmgccdir=`echo "$llvmcc1path" | sed 's,/libexec/.*,,'` LLVMGCCDIR=$llvmgccdir - llvmgccversion=`"$LLVMGCC" -v 2>&1 | grep '^gcc version' | sed 's/^gcc version \([0-9.]*\).*/\1/'` + llvmgccversion=`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'` llvmgccmajvers=`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'` LLVMGCC_VERSION=$llvmgccversion |