aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
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 /libgfortran
parentb08aea04c2f28650b74878096fb0fba8156f0e26 (diff)
downloadgcc-001ddaa852f8e18468e5a9356ba5d2eebb1f7f66.zip
gcc-001ddaa852f8e18468e5a9356ba5d2eebb1f7f66.tar.gz
gcc-001ddaa852f8e18468e5a9356ba5d2eebb1f7f66.tar.bz2
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 'libgfortran')
-rw-r--r--libgfortran/ChangeLog5
-rwxr-xr-xlibgfortran/configure2
2 files changed, 6 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c7b3346..03b1f01 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-18 David Malcolm <dmalcolm@redhat.com>
+
+ PR jit/85384
+ * configure: Regenerate.
+
2018-04-06 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/85253
diff --git a/libgfortran/configure b/libgfortran/configure
index 86904ef..cede17d 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -26570,7 +26570,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# 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