Skip to content

Commit 318b5d0

Browse files
committed
Use gcc/gcc-c++ for el8 builds
1 parent 553c84a commit 318b5d0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

packaging/mysql-connector-c++.spec.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ BuildRequires: cmake3
6161
%else
6262
BuildRequires: cmake
6363
%endif
64-
%if 0%{?fedora} || 0%{?suse_version}
64+
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8
6565
BuildRequires: gcc
6666
BuildRequires: gcc-c++
6767
%else
@@ -118,8 +118,10 @@ test suite for MySQL Connector/C++
118118
%setup -q -n mysql-connector-c++%{product_suffix}-%{version}-src
119119

120120
%build
121+
%if 0%{?rhel} < 8
121122
%{?rhel:export CC=/opt/rh/devtoolset-7/root/usr/bin/gcc}
122123
%{?rhel:export CXX=/opt/rh/devtoolset-7/root/usr/bin/g++}
124+
%endif
123125

124126
%if 0%{?with_tests:1} && 0%{?with_gtest:1}
125127
%global __cmake_test_opts -DWITH_TESTS=1 -DWITH_GTEST=%{with_gtest}

0 commit comments

Comments
 (0)