Skip to content

Commit a770c28

Browse files
committed
Use gcc-toolset
1 parent 7f6422f commit a770c28

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

ci/scripts/jni_manylinux_build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
5353
fi
5454

5555
github_actions_group_begin "Building Arrow C++ libraries"
56-
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
57-
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
56+
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
57+
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
5858
: "${ARROW_ACERO:=ON}"
5959
export ARROW_ACERO
6060
: "${ARROW_BUILD_TESTS:=OFF}"
@@ -76,7 +76,7 @@ export ARROW_ORC
7676
: "${VCPKG_ROOT:=/opt/vcpkg}"
7777
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
7878
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
79-
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
79+
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
8080

8181
export ARROW_TEST_DATA="${arrow_dir}/testing/data"
8282
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"

0 commit comments

Comments
 (0)