File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed
swift-ci/sdks/android/scripts Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ function groupend {
50
50
51
51
function usage {
52
52
cat << EOF
53
- usage: build.sh --source-dir <path> --products-dir <path> --ndk-home <path> --host-toolchain <path>
53
+ usage: build.sh --source-dir <path> --products-dir <path> --ndk-home <path>
54
54
[--name <sdk-name>] [--version <version>] [--build-dir <path>]
55
55
[--archs <arch>[,<arch> ...]]
56
56
158
158
# Change the commas for spaces
159
159
archs=" ${archs// ,/ } "
160
160
161
- if [[ -z " $source_dir " || -z " $products_dir " || -z " $ndk_home " || -z " $host_toolchain " ]]; then
161
+ if [[ -z " $source_dir " || -z " $products_dir " || -z " $ndk_home " ]]; then
162
162
usage
163
163
exit 1
164
164
fi
@@ -237,8 +237,10 @@ export ANDROID_NDK_HOME=$ndk_home
237
237
export ANDROID_NDK=$ndk_home
238
238
239
239
echo " Swift found at ${swift_dir} "
240
- echo " Host toolchain found at ${host_toolchain} "
241
- ${host_toolchain} /bin/swift --version
240
+ if [[ ! -z " ${host_toolchain} " ]]; then
241
+ echo " Host toolchain found at ${host_toolchain} "
242
+ ${host_toolchain} /bin/swift --version
243
+ fi
242
244
echo " Android NDK found at ${ndk_home} "
243
245
${ndk_installation} /bin/clang --version
244
246
echo " Building for ${archs} "
You can’t perform that action at this time.
0 commit comments