Skip to content

Commit 91e6c89

Browse files
committed
Add llbuild CMake options array to provide DCMAKE_OSX_ARCHITECTURES
1 parent cc8660a commit 91e6c89

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

utils/build-script-impl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ function set_build_options_for_host() {
422422
swift_cmake_options=()
423423
cmark_cmake_options=()
424424
lldb_cmake_options=()
425+
llbuild_cmake_options=()
425426
SWIFT_HOST_VARIANT=
426427
SWIFT_HOST_VARIANT_SDK=
427428
SWIFT_HOST_VARIANT_ARCH=
@@ -687,6 +688,9 @@ function set_build_options_for_host() {
687688
-DCMAKE_OSX_SYSROOT:PATH="${cmake_os_sysroot}"
688689
-DCMAKE_OSX_ARCHITECTURES="${architecture}"
689690
)
691+
llbuild_cmake_options+=(
692+
-DCMAKE_OSX_ARCHITECTURES="${architecture}"
693+
)
690694
;;
691695
esac
692696

@@ -2024,13 +2028,13 @@ for host in "${ALL_HOSTS[@]}"; do
20242028
llbuild)
20252029
cmake_options=(
20262030
"${cmake_options[@]}"
2031+
"${llbuild_cmake_options[@]}"
20272032

20282033
-DCMAKE_BUILD_TYPE:STRING="${LLBUILD_BUILD_TYPE}"
20292034
-DCMAKE_C_COMPILER:PATH="${CLANG_BIN}/clang"
20302035
-DCMAKE_CXX_COMPILER:PATH="${CLANG_BIN}/clang++"
20312036
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
20322037
-DCMAKE_Swift_COMPILER:PATH=${SWIFTC_BIN}
2033-
-DCMAKE_OSX_ARCHITECTURES="${architecture}"
20342038

20352039
-DLLBUILD_ENABLE_ASSERTIONS:BOOL=$(true_false "${LLBUILD_ENABLE_ASSERTIONS}")
20362040
-DLLBUILD_SUPPORT_BINDINGS:=Swift

0 commit comments

Comments
 (0)