aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2015-06-19 10:53:52 +0200
committerChristophe Lyon <christophe.lyon@linaro.org>2015-06-19 14:10:27 +0200
commit8467905f3d87679a851c3f71b1211ef1265f3df1 (patch)
treee96530353420575585d89024d9ad97cb238a8c66
parent1f1869267e564ddc3521a1000fcb5d992486e220 (diff)
2015-06-19 Christophe Lyon <christophe.lyon@linaro.org>
gcc/ * configure.ac: Add Linaro version string. * configure: Regenerate.
-rwxr-xr-xgcc/configure9
-rw-r--r--gcc/configure.ac2
2 files changed, 6 insertions, 5 deletions
diff --git a/gcc/configure b/gcc/configure
index 24e143083f9..d1f6c81ac7e 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1699,7 +1699,8 @@ Optional Packages:
use sysroot as the system root during the build
--with-sysroot[=DIR] search for usr/lib, usr/include, et al, within DIR
--with-specs=SPECS add SPECS to driver command-line processing
- --with-pkgversion=PKG Use PKG in the version string in place of "GCC"
+ --with-pkgversion=PKG Use PKG in the version string in place of "Linaro
+ GCC `cat $srcdir/LINARO-VERSION`"
--with-bugurl=URL Direct users to URL to report a bug
--with-multilib-list select multilibs (AArch64, SH and x86-64 only)
--with-gnu-ld assume the C compiler uses GNU ld default=no
@@ -7362,7 +7363,7 @@ if test "${with_pkgversion+set}" = set; then :
*) PKGVERSION="($withval) " ;;
esac
else
- PKGVERSION="(GCC) "
+ PKGVERSION="(Linaro GCC `cat $srcdir/LINARO-VERSION`) "
fi
@@ -18162,7 +18163,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18165 "configure"
+#line 18166 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18268,7 +18269,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18271 "configure"
+#line 18272 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 84d83415fe0..5d30429cbe6 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -862,7 +862,7 @@ AC_ARG_WITH(specs,
)
AC_SUBST(CONFIGURE_SPECS)
-ACX_PKGVERSION([GCC])
+ACX_PKGVERSION([Linaro GCC `cat $srcdir/LINARO-VERSION`])
ACX_BUGURL([http://gcc.gnu.org/bugs.html])
# Sanity check enable_languages in case someone does not run the toplevel