Skip to content

Commit

Permalink
apacheGH-37266: [CI][C++] Avoid clobbering build type with CMAKE_ARGS
Browse files Browse the repository at this point in the history
Since CMAKE_ARGS could in some circumstances (conda-forge) override CMAKE_BUILD_TYPE, pass it first and let our own choice override it.
  • Loading branch information
pitrou committed Aug 21, 2023
1 parent 6357c9f commit f883af5
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ci/scripts/cpp_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ esac
mkdir -p ${build_dir}
pushd ${build_dir}

# CMAKE_ARGS is passed first because of GH-37266
cmake \
${CMAKE_ARGS} \
-Dabsl_SOURCE=${absl_SOURCE:-} \
-DARROW_ACERO=${ARROW_ACERO:-OFF} \
-DARROW_AZURE=${ARROW_AZURE:-OFF} \
Expand Down Expand Up @@ -183,7 +185,6 @@ cmake \
-Dzstd_SOURCE=${zstd_SOURCE:-} \
-Dxsimd_SOURCE=${xsimd_SOURCE:-} \
-G "${CMAKE_GENERATOR:-Ninja}" \
${CMAKE_ARGS} \
${source_dir}

export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$[${n_jobs} + 1]}
Expand Down

0 comments on commit f883af5

Please sign in to comment.