From 587973fd8b31d86e981401be0a3fcd0698b31f20 Mon Sep 17 00:00:00 2001 From: Butta Date: Tue, 28 Jul 2020 12:27:48 +0530 Subject: [PATCH] [build] Remove unemployed 'skip-{build,test}-*' flags from build-script-impl These flags have done nothing for awhile, as 26 of 31 have already been moved to build-script. Only the flags related to haiku, maccatalyst, and external-benchmarks are unrecognized by either build script after this removal. --- utils/build-script | 55 ----------------------------------------- utils/build-script-impl | 31 ----------------------- 2 files changed, 86 deletions(-) diff --git a/utils/build-script b/utils/build-script index e3ed824f977d9..f92750df7c1a3 100755 --- a/utils/build-script +++ b/utils/build-script @@ -560,9 +560,6 @@ class BuildScriptInvocation(object): impl_args += ["--skip-build"] if not args.build_benchmarks: impl_args += ["--skip-build-benchmarks"] - # Currently we do not build external benchmarks by default. - if args.build_external_benchmarks: - impl_args += ["--skip-build-external-benchmarks=0"] # Then add subproject install flags that either skip building them /or/ # if we are going to build them and install_all is set, we also install @@ -596,26 +593,6 @@ class BuildScriptInvocation(object): if args.build_swift_static_sdk_overlay: impl_args += ["--build-swift-static-sdk-overlay"] - if not args.build_linux: - impl_args += ["--skip-build-linux"] - if not args.build_freebsd: - impl_args += ["--skip-build-freebsd"] - if not args.build_cygwin: - impl_args += ["--skip-build-cygwin"] - if not args.build_osx: - impl_args += ["--skip-build-osx"] - if not args.build_ios_device: - impl_args += ["--skip-build-ios-device"] - if not args.build_ios_simulator: - impl_args += ["--skip-build-ios-simulator"] - if not args.build_tvos_device: - impl_args += ["--skip-build-tvos-device"] - if not args.build_tvos_simulator: - impl_args += ["--skip-build-tvos-simulator"] - if not args.build_watchos_device: - impl_args += ["--skip-build-watchos-device"] - if not args.build_watchos_simulator: - impl_args += ["--skip-build-watchos-simulator"] if not args.build_android: impl_args += ["--skip-build-android"] if not args.build_clang_tools_extra: @@ -633,32 +610,6 @@ class BuildScriptInvocation(object): "--skip-test-libdispatch", "--skip-test-libicu", ] - if not args.test_linux: - impl_args += ["--skip-test-linux"] - if not args.test_freebsd: - impl_args += ["--skip-test-freebsd"] - if not args.test_cygwin: - impl_args += ["--skip-test-cygwin"] - if not args.test_osx: - impl_args += ["--skip-test-osx"] - if not args.test_ios_host: - impl_args += ["--skip-test-ios-host"] - if not args.test_ios_simulator: - impl_args += ["--skip-test-ios-simulator"] - if not args.test_ios_32bit_simulator: - impl_args += ["--skip-test-ios-32bit-simulator"] - if not args.test_tvos_host: - impl_args += ["--skip-test-tvos-host"] - if not args.test_tvos_simulator: - impl_args += ["--skip-test-tvos-simulator"] - if not args.test_watchos_host: - impl_args += ["--skip-test-watchos-host"] - if not args.test_watchos_simulator: - impl_args += ["--skip-test-watchos-simulator"] - if not args.test_android: - impl_args += ["--skip-test-android"] - if not args.test_android_host: - impl_args += ["--skip-test-android-host"] if args.build_runtime_with_host_compiler: impl_args += ["--build-runtime-with-host-compiler"] if args.validation_test: @@ -673,12 +624,6 @@ class BuildScriptInvocation(object): impl_args += ["--only-executable-test"] if not args.benchmark: impl_args += ["--skip-test-benchmarks"] - if not args.test_optimized: - impl_args += ["--skip-test-optimized"] - if not args.test_optimize_for_size: - impl_args += ["--skip-test-optimize-for-size"] - if not args.test_optimize_none_with_implicit_dynamic: - impl_args += ["--skip-test-optimize-none-with-implicit-dynamic"] if args.build_libparser_only: impl_args += ["--build-libparser-only"] if args.android: diff --git a/utils/build-script-impl b/utils/build-script-impl index e3917be0f9a33..7b223c34299cd 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -126,40 +126,9 @@ KNOWN_SETTINGS=( skip-build-clang-tools-extra "" "set to skip building clang-tools-extra as part of llvm" skip-build-compiler-rt "" "set to skip building Compiler-RT" skip-build-lld "" "set to skip building lld as part of llvm (linux only)" - skip-build-cygwin "" "set to skip building Swift stdlibs for Cygwin" - skip-build-external-benchmarks "1" "set to skip building the external Swift Benchmark Suite. (skipped by default)" - skip-build-freebsd "" "set to skip building Swift stdlibs for FreeBSD" - skip-build-haiku "" "set to skip building Swift stdlibs for Haiku" - skip-build-ios-device "" "set to skip building Swift stdlibs for iOS devices (i.e. build simulators only)" - skip-build-ios-simulator "" "set to skip building Swift stdlibs for iOS simulators (i.e. build devices only)" - skip-build-linux "" "set to skip building Swift stdlibs for Linux" - skip-build-maccatalyst "" "set to skip building Swift stdlibs for macCatalyst" - skip-build-osx "" "set to skip building Swift stdlibs for OS X" - skip-build-tvos-device "" "set to skip building Swift stdlibs for tvOS devices (i.e. build simulators only)" - skip-build-tvos-simulator "" "set to skip building Swift stdlibs for tvOS simulators (i.e. build devices only)" - skip-build-watchos-device "" "set to skip building Swift stdlibs for Apple watchOS devices (i.e. build simulators only)" - skip-build-watchos-simulator "" "set to skip building Swift stdlibs for Apple watchOS simulators (i.e. build devices only)" ## Skip Test ... - skip-test-android "" "set to skip testing Swift stdlibs for Android" - skip-test-android-host "" "set to skip testing the host parts of the Android toolchain" - skip-test-cygwin "" "set to skip testing Swift stdlibs for Cygwin" - skip-test-freebsd "" "set to skip testing Swift stdlibs for FreeBSD" - skip-test-haiku "" "set to skip testing Swift stdlibs for Haiku" - skip-test-ios-32bit-simulator "" "set to skip testing Swift stdlibs for iOS 32bit simulators" - skip-test-ios-host "" "set to skip testing the host parts of the iOS toolchain" - skip-test-ios-simulator "" "set to skip testing Swift stdlibs for iOS simulators (i.e. test devices only)" - skip-test-linux "" "set to skip testing Swift stdlibs for Linux" - skip-test-maccatalyst "" "set to skip testing Swift stdlibs for macCatalyst" - skip-test-osx "" "set to skip testing Swift stdlibs for OS X" - skip-test-tvos-host "" "set to skip testing the host parts of the tvOS toolchain" - skip-test-tvos-simulator "" "set to skip testing Swift stdlibs for tvOS simulators (i.e. test devices only)" - skip-test-watchos-host "" "set to skip testing the host parts of the watchOS toolchain" - skip-test-watchos-simulator "" "set to skip testing Swift stdlibs for Apple watchOS simulators (i.e. test devices only)" skip-test-benchmarks "" "set to skip running Swift Benchmark Suite" - skip-test-optimized "" "set to skip testing the test suite in optimized mode" - skip-test-optimize-for-size "" "set to skip testing the test suite in optimize for size mode" - skip-test-optimize-none-with-implicit-dynamic "" "set to skip testing the test suite in optimize none with implicit dynamic mode" skip-test-sourcekit "" "set to skip testing SourceKit" ## Extra ... CMake Options