From 001ddaa852f8e18468e5a9356ba5d2eebb1f7f66 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 18 Apr 2018 09:46:58 +0000 Subject: 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 --- liboffloadmic/ChangeLog | 6 ++++++ liboffloadmic/configure | 2 +- liboffloadmic/plugin/configure | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'liboffloadmic') diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 72f0752..28c8abd 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,9 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + * plugin/configure: Regenerate. + 2017-01-31 Thomas Schwinge * plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_get_type): Fix diff --git a/liboffloadmic/configure b/liboffloadmic/configure index e22b214..f873716 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 8b8c041..c031eb3 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 -- cgit v1.1