@@ -42,9 +42,11 @@ if [ -n "${CONDA_PREFIX}" ] && [ "${ARROW_EMSCRIPTEN:-OFF}" = "OFF" ]; then
4242 ARROW_CMAKE_ARGS+=" -DCMAKE_RANLIB=${RANLIB} "
4343 fi
4444 export ARROW_CMAKE_ARGS
45- export ARROW_GANDIVA_PC_CXX_FLAGS=$( echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep ' ^ ' | awk ' {print "-isystem;" substr($1, 1)}' | tr ' \n' ' ;' )
45+ ARROW_GANDIVA_PC_CXX_FLAGS=$( echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep ' ^ ' | awk ' {print "-isystem;" substr($1, 1)}' | tr ' \n' ' ;' )
46+ export ARROW_GANDIVA_PC_CXX_FLAGS
4647elif [ -x " $( command -v xcrun) " ]; then
47- export ARROW_GANDIVA_PC_CXX_FLAGS=" -isysroot;$( xcrun --show-sdk-path) "
48+ ARROW_GANDIVA_PC_CXX_FLAGS=" -isysroot;$( xcrun --show-sdk-path) "
49+ export ARROW_GANDIVA_PC_CXX_FLAGS
4850fi
4951
5052if [ " ${GITHUB_ACTIONS:- false} " = " true" ]; then
@@ -103,6 +105,7 @@ pushd ${build_dir}
103105if [ " ${ARROW_OFFLINE} " = " ON" ]; then
104106 ${source_dir} /thirdparty/download_dependencies.sh ${PWD} /thirdparty > \
105107 enable_offline_build.sh
108+ # shellcheck source=/dev/null
106109 . enable_offline_build.sh
107110 # We can't use mv because we can't remove /etc/resolv.conf in Docker
108111 # container.
@@ -155,11 +158,13 @@ if [ "${ARROW_USE_MESON:-OFF}" = "ON" ]; then
155158elif [ " ${ARROW_EMSCRIPTEN:- OFF} " = " ON" ]; then
156159 if [ " ${UBUNTU} " = " 20.04" ]; then
157160 echo " arrow emscripten build is not supported on Ubuntu 20.04, run with UBUNTU=22.04"
158- exit - 1
161+ exit 1
159162 fi
160163 n_jobs=2 # Emscripten build fails on docker unless this is set really low
164+ # shellcheck source=/dev/null
161165 source ~ /emsdk/emsdk_env.sh
162- export CMAKE_INSTALL_PREFIX=$( em-config CACHE) /sysroot
166+ CMAKE_INSTALL_PREFIX=$( em-config CACHE) /sysroot
167+ export CMAKE_INSTALL_PREFIX
163168 # conda sets LDFLAGS / CFLAGS etc. which break
164169 # emcmake so we unset them
165170 unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
288293 ${source_dir}
289294fi
290295
291- : ${ARROW_BUILD_PARALLEL:= $[${ n_jobs} + 1]}
296+ : " ${ARROW_BUILD_PARALLEL:= $(( n_jobs + 1))} "
292297if [ " ${ARROW_USE_MESON:- OFF} " = " ON" ]; then
293298 time meson compile -j ${ARROW_BUILD_PARALLEL}
294299 meson install
0 commit comments