This patch updates gcc/configure.ac to use gcc_base_ver. I had to drop the \$\$ from the sed expression to get it to work within the configure script; I'm not entirely sure what their purpose is. Without them, it's still matching on the first group of numeric characters in BASE-VER.
Tested with and without --with-gcc-major-version; in each case, gcc-driver-name.h is correctly determined. Fixes the linker issue reported downstream in https://bugzilla.redhat.com/show_bug.cgi?id=1566178 and fixes the driver not found issue with: gcc_jit_context_set_bool_use_external_driver (ctxt, 1); Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. OK for trunk? config/ChangeLog: PR jit/85384 * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression. gcc/ChangeLog: PR jit/85384 * 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.ac: Regenerate. --- config/acx.m4 | 2 +- gcc/configure.ac | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/acx.m4 b/config/acx.m4 index aa1d34b..87c1b5e 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -246,7 +246,7 @@ AC_DEFUN([GCC_BASE_VER], [AS_HELP_STRING([--with-gcc-major-version-only], [use only GCC major number in filesystem paths])], [if test x$with_gcc_major_version_only = xyes ; then changequote(,)dnl - get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'" changequote([,])dnl fi ]) diff --git a/gcc/configure.ac b/gcc/configure.ac index 67e1682..b066cc6 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -6499,8 +6499,10 @@ AC_DEFINE_UNQUOTED(DIAGNOSTICS_COLOR_DEFAULT, $DIAGNOSTICS_COLOR_DEFAULT, # Generate gcc-driver-name.h containing GCC_DRIVER_NAME for the benefit # of jit/jit-playback.c. +gcc_driver_version=`eval "${get_gcc_base_ver} $srcdir/BASE-VER"` +echo "gcc_driver_version: ${gcc_driver_version}" cat > gcc-driver-name.h <<EOF -#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_BASEVER}${exeext}" +#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_driver_version}${exeext}" EOF # Check whether --enable-default-pie was given. -- 1.8.5.3