diff options
author | David Malcolm <dmalcolm@redhat.com> | 2018-04-18 09:46:58 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-04-18 11:46:58 +0200 |
commit | 001ddaa852f8e18468e5a9356ba5d2eebb1f7f66 (patch) | |
tree | aef33a6ef006568578b391fab19aefd57ef86ecc /liboffloadmic | |
parent | b08aea04c2f28650b74878096fb0fba8156f0e26 (diff) | |
download | gcc-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 'liboffloadmic')
-rw-r--r-- | liboffloadmic/ChangeLog | 6 | ||||
-rw-r--r-- | liboffloadmic/configure | 2 | ||||
-rw-r--r-- | liboffloadmic/plugin/configure | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 72f07523637..28c8abd535a 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,9 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + * plugin/configure: Regenerate. + 2017-01-31 Thomas Schwinge <thomas@codesourcery.com> * plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_get_type): Fix diff --git a/liboffloadmic/configure b/liboffloadmic/configure index e22b214ddbc..f873716991b 100644 --- a/liboffloadmic/configure +++ b/liboffloadmic/configure @@ -14492,7 +14492,7 @@ fi # 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 diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure index 8b8c041d2bf..c031eb3e7fa 100644 --- a/liboffloadmic/plugin/configure +++ b/liboffloadmic/plugin/configure @@ -14187,7 +14187,7 @@ hardcode_into_libs=no # 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 |