Skip to content

Commit 137e50d

Browse files
kouraulcd
authored andcommitted
GH-36686: [C++] Pass CMAKE_OSX_SYSROOT to external projects (#36706)
### Rationale for this change If we use different macOS SDK in Apache Arrow C++ and bundled projects, it will cause some problems such as a build error. ### What changes are included in this PR? Pass `CMAKE_OSX_SYSROOT` explicitly to external projects. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * Closes: #36686 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Dewey Dunnington <[email protected]>
1 parent 453965d commit 137e50d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ set(EP_COMMON_CMAKE_ARGS
916916
-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}
917917
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}
918918
-DCMAKE_INSTALL_LIBDIR=lib
919+
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
919920
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
920921

921922
# Enable s/ccache if set by parent.

dev/tasks/macros.jinja

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,14 @@ on:
238238
cp ../dev/tasks/homebrew-formulae/autobrew/apache-arrow*.rb tools/
239239

240240
# Pin the git commit in the formula to match
241-
cd tools
241+
pushd tools
242242
if [ "{{ is_fork }}" == "true" ]; then
243-
sed -i.bak -E -e 's/apache\/arrow.git"$/{{ arrow.github_repo.split("/") | join("\/") }}.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb
243+
sed -i.bak -E -e 's/apache\/arrow.git", branch: "main"$/{{ arrow.github_repo.split("/") | join("\/") }}.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb
244244
else
245-
sed -i.bak -E -e 's/arrow.git"$/arrow.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb
245+
sed -i.bak -E -e 's/arrow.git", branch: "main"$/arrow.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb
246246
fi
247247
rm -f apache-arrow*.rb.bak
248+
popd
248249
{% endmacro %}
249250

250251
{%- macro github_change_r_pkg_version(is_fork, version) -%}

0 commit comments

Comments
 (0)