File tree Expand file tree Collapse file tree 1 file changed +12
-4
lines changed
Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
5353fi
5454
5555github_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+ case " $( arch) " in
57+ x86_64)
58+ vcpkg_arch=x64
59+ ;;
60+ aarch64)
61+ vcpkg_arch=arm64
62+ ;;
63+ esac
64+ gcc_toolset_version=" $( rpm -qa " gcc-toolset-*-runtime" --queryformat ' %{VERSION}' | grep -o " ^[0-9]*" ) "
65+ gcc_toolset_include_cpp=" /opt/rh/gcc-toolset-${gcc_toolset_version} /root/usr/include/c++/${gcc_toolset_version} "
5866: " ${ARROW_ACERO:= ON} "
5967export ARROW_ACERO
6068: " ${ARROW_BUILD_TESTS:= OFF} "
@@ -75,8 +83,8 @@ export ARROW_ORC
7583: " ${CMAKE_UNITY_BUILD:= ON} "
7684: " ${VCPKG_ROOT:=/ opt/ vcpkg} "
7785: " ${VCPKG_FEATURE_FLAGS:= -manifests} "
78- : " ${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} "
86+ : " ${VCPKG_TARGET_TRIPLET:= ${VCPKG_DEFAULT_TRIPLET:- ${vcpkg_arch} -linux-static-${CMAKE_BUILD_TYPE} } } "
87+ : " ${GANDIVA_CXX_FLAGS:= -isystem;${gcc_toolset_include_cpp } ;-isystem;${gcc_toolset_include_cpp} / $(arch) -redhat-linux;-lpthread} "
8088
8189export ARROW_TEST_DATA=" ${arrow_dir} /testing/data"
8290export PARQUET_TEST_DATA=" ${arrow_dir} /cpp/submodules/parquet-testing/data"
You can’t perform that action at this time.
0 commit comments