Skip to content

Commit 90c07b3

Browse files
committed
Try suggested fix
1 parent 945f827 commit 90c07b3

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

ci/scripts/cpp_build.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ if [ ! -z "${CONDA_PREFIX}" ] && [ "${ARROW_EMSCRIPTEN:-OFF}" = "OFF" ]; then
3434
echo -e "===\n=== Conda environment for build\n==="
3535
conda list
3636

37-
export ARROW_CMAKE_ARGS="${ARROW_CMAKE_ARGS} -DCMAKE_AR=${AR} -DCMAKE_RANLIB=${RANLIB}"
37+
if [ -n "${AR}" ]; then
38+
ARROW_CMAKE_ARGS+=" -DCMAKE_AR=${AR}"
39+
fi
40+
if [ -n "${RANLIB}" ]; then
41+
ARROW_CMAKE_ARGS+=" -DCMAKE_RANLIB=${RANLIB}"
42+
fi
43+
export ARROW_CMAKE_ARGS
3844
export ARROW_GANDIVA_PC_CXX_FLAGS=$(echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep '^ ' | awk '{print "-isystem;" substr($1, 1)}' | tr '\n' ';')
3945
elif [ -x "$(command -v xcrun)" ]; then
4046
export ARROW_GANDIVA_PC_CXX_FLAGS="-isysroot;$(xcrun --show-sdk-path)"

0 commit comments

Comments
 (0)