File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -422,6 +422,7 @@ function set_build_options_for_host() {
422
422
swift_cmake_options=()
423
423
cmark_cmake_options=()
424
424
lldb_cmake_options=()
425
+ llbuild_cmake_options=()
425
426
SWIFT_HOST_VARIANT=
426
427
SWIFT_HOST_VARIANT_SDK=
427
428
SWIFT_HOST_VARIANT_ARCH=
@@ -687,6 +688,9 @@ function set_build_options_for_host() {
687
688
-DCMAKE_OSX_SYSROOT:PATH=" ${cmake_os_sysroot} "
688
689
-DCMAKE_OSX_ARCHITECTURES=" ${architecture} "
689
690
)
691
+ llbuild_cmake_options+=(
692
+ -DCMAKE_OSX_ARCHITECTURES=" ${architecture} "
693
+ )
690
694
;;
691
695
esac
692
696
@@ -2024,13 +2028,13 @@ for host in "${ALL_HOSTS[@]}"; do
2024
2028
llbuild)
2025
2029
cmake_options=(
2026
2030
" ${cmake_options[@]} "
2031
+ " ${llbuild_cmake_options[@]} "
2027
2032
2028
2033
-DCMAKE_BUILD_TYPE:STRING=" ${LLBUILD_BUILD_TYPE} "
2029
2034
-DCMAKE_C_COMPILER:PATH=" ${CLANG_BIN} /clang"
2030
2035
-DCMAKE_CXX_COMPILER:PATH=" ${CLANG_BIN} /clang++"
2031
2036
-DCMAKE_INSTALL_PREFIX:PATH=" $( get_host_install_prefix ${host} ) "
2032
2037
-DCMAKE_Swift_COMPILER:PATH=${SWIFTC_BIN}
2033
- -DCMAKE_OSX_ARCHITECTURES=" ${architecture} "
2034
2038
2035
2039
-DLLBUILD_ENABLE_ASSERTIONS:BOOL=$( true_false " ${LLBUILD_ENABLE_ASSERTIONS} " )
2036
2040
-DLLBUILD_SUPPORT_BINDINGS:=Swift
You can’t perform that action at this time.
0 commit comments