summaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2018-04-18 09:46:58 +0000
committerJakub Jelinek <jakub@gcc.gnu.org>2018-04-18 11:46:58 +0200
commit001ddaa852f8e18468e5a9356ba5d2eebb1f7f66 (patch)
treeaef33a6ef006568578b391fab19aefd57ef86ecc /libgcc
parentb08aea04c2f28650b74878096fb0fba8156f0e26 (diff)
downloadgcc-001ddaa852f8e18468e5a9356ba5d2eebb1f7f66.tar.gz
re PR jit/85384 (libgccjit does not work if --with-gcc-major-version is used)
PR jit/85384 * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression. * configure.ac (gcc-driver-name.h): Honor --with-gcc-major-version by using gcc_base_ver to generate a gcc_driver_version, and use it when generating GCC_DRIVER_NAME. * configure: Regenerate. * configure: Regenerate. From-SVN: r259462
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog5
-rw-r--r--libgcc/configure2
2 files changed, 6 insertions, 1 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index aeaa6539167..35384848318 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-18 David Malcolm <dmalcolm@redhat.com>
+
+ PR jit/85384
+ * configure: Regenerate.
+
2018-04-16 Jakub Jelinek <jakub@redhat.com>
PR target/84945
diff --git a/libgcc/configure b/libgcc/configure
index 7399c862bb0..e0caeecd3bb 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -5463,7 +5463,7 @@ esac
# Check whether --with-gcc-major-version-only was given.
if test "${with_gcc_major_version_only+set}" = set; then :
withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then
- get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'"
+ get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'"
fi
fi