2020-09-07 18:23:03 +02:00
commit 5fa1d36f4b558070fc2bf54ecde19e6a35e4839e
Date: Tue Sep 1 00:45:55 2020 +0530
[build] Add the flags to enable cross-compiling the corelibs
Pass the Swift and CMake flags needed to cross-compile Foundation and so on, with
the first example of Android AArch64. Add a new flag, --cross-compile-deps-path,
which is used to search for cross-compiled libraries, like libcurl, that the
corelibs depend on.
diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
index 6f0c2b5bf71..db6e0ad10d6 100755
--- a/swift/utils/build-script-impl
+++ b/swift/utils/build-script-impl
@@ -240,6 +240,7 @@ KNOWN_SETTINGS=(
cross-compile-hosts "" "space-separated list of targets to cross-compile host Swift tools for"
cross-compile-with-host-tools "" "set to use the clang we build for the host to then build the cross-compile hosts"
cross-compile-install-prefixes "" "semicolon-separated list of install prefixes to use for the cross-compiled hosts. The list expands, so if there are more cross-compile hosts than prefixes, unmatched hosts use the last prefix in the list"
+ cross-compile-deps-path "" "path for CMake to look for cross-compiled library dependencies, such as libXML2"
skip-merge-lipo-cross-compile-tools "" "set to skip running merge-lipo after installing cross-compiled host Swift tools"
coverage-db "" "If set, coverage database to use when prioritizing testing"
skip-local-host-install "" "If we are cross-compiling multiple targets, skip an install pass locally if the hosts match"
2021-01-29 15:04:54 +01:00
@@ -1621,6 +1622,9 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DCMAKE_BUILD_TYPE:STRING="${CMARK_BUILD_TYPE}"
"${cmark_cmake_options[@]}"
)
+ if [[ $(is_cross_tools_host ${host}) ]] ; then
+ add_cross_cmake_options ${host} cmake_options
+ fi
build_targets=(all)
;;
2021-01-29 15:04:54 +01:00
@@ -1725,6 +1729,7 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DCLANG_TABLEGEN=$(build_directory "${LOCAL_HOST}" llvm)/bin/clang-tblgen
-DLLVM_NATIVE_BUILD=$(build_directory "${LOCAL_HOST}" llvm)
)
+ add_cross_cmake_options ${host} cmake_options
fi
;;
2021-01-29 15:04:54 +01:00
@@ -2089,7 +2094,7 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DCMAKE_CXX_COMPILER:PATH="${CLANG_BIN}/clang++"
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
-DCMAKE_Swift_COMPILER:PATH=${SWIFTC_BIN}
2021-01-29 15:04:54 +01:00
- -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\""
+ -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\" $(common_swift_flags ${host})"
2020-09-07 18:23:03 +02:00
-DLLBUILD_ENABLE_ASSERTIONS:BOOL=$(true_false "${LLBUILD_ENABLE_ASSERTIONS}")
-DLLBUILD_SUPPORT_BINDINGS:=Swift
2021-01-29 15:04:54 +01:00
@@ -2105,6 +2110,16 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DFoundation_DIR:PATH=$(build_directory ${host} foundation)/cmake/modules
)
+ if [[ $(is_cross_tools_host ${host}) ]] ; then
+ add_cross_cmake_options ${host} cmake_options
+
+ # CROSS_COMPILE_DEPS_PATH is searched for the SQLite3 dependency.
+ cmake_options+=(
+ -DCMAKE_FIND_ROOT_PATH:PATH="${CROSS_COMPILE_DEPS_PATH}"
+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER
+ )
+ fi
+
# Ensure on Darwin platforms that we consider only the SQLite headers
# from the SDK instead of picking ones found elsewhere
# (e.g. in /usr/include )
2021-01-29 15:04:54 +01:00
@@ -2163,7 +2178,7 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DCMAKE_C_COMPILER:PATH="${CLANG_BIN}/clang"
-DCMAKE_CXX_COMPILER:PATH="${CLANG_BIN}/clang++"
-DCMAKE_Swift_COMPILER:PATH=${SWIFTC_BIN}
2021-01-29 15:04:54 +01:00
- -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\""
+ -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\" $(common_swift_flags ${host})"
2020-09-07 18:23:03 +02:00
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
-DCMAKE_INSTALL_LIBDIR:PATH="lib"
2021-01-29 15:04:54 +01:00
@@ -2179,6 +2194,9 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DENABLE_TESTING=YES
)
+ if [[ $(is_cross_tools_host ${host}) ]] ; then
+ add_cross_cmake_options ${host} cmake_options
+ fi
;;
esac
2021-01-29 15:04:54 +01:00
@@ -2232,7 +2250,7 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DCMAKE_CXX_COMPILER:PATH=${CLANG_BIN}/clang++
-DCMAKE_SWIFT_COMPILER:PATH=${SWIFTC_BIN}
-DCMAKE_Swift_COMPILER:PATH=${SWIFTC_BIN}
2021-01-29 15:04:54 +01:00
- -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\""
+ -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\" $(common_swift_flags ${host})"
2020-09-07 18:23:03 +02:00
-DCMAKE_INSTALL_PREFIX:PATH=$(get_host_install_prefix ${host})
${LIBICU_BUILD_ARGS[@]}
2021-01-29 15:04:54 +01:00
@@ -2248,6 +2266,17 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DBUILD_SHARED_LIBS=$([[ ${product} == foundation_static ]] && echo "NO" || echo "YES")
)
+ if [[ $(is_cross_tools_host ${host}) ]] ; then
+ add_cross_cmake_options ${host} cmake_options
+
+ # CROSS_COMPILE_DEPS_PATH is searched for the ICU, libXML2
+ # and libcurl dependencies.
+ cmake_options+=(
+ -DCMAKE_FIND_ROOT_PATH:PATH="${CROSS_COMPILE_DEPS_PATH}"
+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER
+ )
+ fi
+
;;
libdispatch|libdispatch_static)
LIBDISPATCH_BUILD_DIR=$(build_directory ${host} ${product})
2021-01-29 15:04:54 +01:00
@@ -2274,7 +2303,7 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DCMAKE_CXX_COMPILER:PATH="${CLANG_BIN}/clang++"
-DCMAKE_SWIFT_COMPILER:PATH="${SWIFTC_BIN}"
-DCMAKE_Swift_COMPILER:PATH="${SWIFTC_BIN}"
2021-01-29 15:04:54 +01:00
- -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\""
+ -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\" $(common_swift_flags ${host})"
2020-09-07 18:23:03 +02:00
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
-DCMAKE_INSTALL_LIBDIR:PATH="lib"
2021-01-29 15:04:54 +01:00
@@ -2283,6 +2312,9 @@ for host in "${ALL_HOSTS[@]}"; do
2020-09-07 18:23:03 +02:00
-DENABLE_TESTING=YES
-DBUILD_SHARED_LIBS=$([[ ${product} == libdispatch_static ]] && echo "NO" || echo "YES")
)
+ if [[ $(is_cross_tools_host ${host}) ]] ; then
+ add_cross_cmake_options ${host} cmake_options
+ fi
;;
esac
