diff --git a/autogen.sh b/autogen.sh index 98dcb950886e..8c0bb0ade4ba 100755 --- a/autogen.sh +++ b/autogen.sh @@ -151,13 +151,6 @@ if (defined $ENV{LODE_HOME}) $ENV{PATH}="$ENV{LODE_HOME}/opt/bin:$ENV{PATH}"; print STDERR "add LODE_HOME/opt/bin in PATH\n"; } - # For the Config=linux_gcc_release_64 Jenkins jobs that build on CentOS against Developer - # Toolset 7: - if ($ENV{Config} eq 'linux_gcc_release_64' && -d '/opt/rh/devtoolset-7/root/usr/bin') - { - $ENV{PATH}="/opt/rh/devtoolset-7/root/usr/bin:$ENV{PATH}"; - print STDERR "added /opt/rh/devtoolset-7/root/usr/bin to PATH\n"; - } } my $aclocal_flags = $ENV{ACLOCAL_FLAGS}; diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64 index 962c332840de..e30c34f941a4 100644 --- a/distro-configs/Jenkins/linux_gcc_release_64 +++ b/distro-configs/Jenkins/linux_gcc_release_64 @@ -1,2 +1,4 @@ --disable-werror +CC=/opt/rh/devtoolset-7/root/usr/bin/gcc +CXX=/opt/rh/devtoolset-7/root/usr/bin/g++