Skip to content

Commit 587973f

Browse files
finagolfinfinagolfin
committed
[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.
1 parent a1ae109 commit 587973f

File tree

2 files changed

+0
-86
lines changed

2 files changed

+0
-86
lines changed

‎utils/build-script

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,6 @@ class BuildScriptInvocation(object):
560560
impl_args += ["--skip-build"]
561561
if not args.build_benchmarks:
562562
impl_args += ["--skip-build-benchmarks"]
563-
# Currently we do not build external benchmarks by default.
564-
if args.build_external_benchmarks:
565-
impl_args += ["--skip-build-external-benchmarks=0"]
566563

567564
# Then add subproject install flags that either skip building them /or/
568565
# if we are going to build them and install_all is set, we also install
@@ -596,26 +593,6 @@ class BuildScriptInvocation(object):
596593
if args.build_swift_static_sdk_overlay:
597594
impl_args += ["--build-swift-static-sdk-overlay"]
598595

599-
if not args.build_linux:
600-
impl_args += ["--skip-build-linux"]
601-
if not args.build_freebsd:
602-
impl_args += ["--skip-build-freebsd"]
603-
if not args.build_cygwin:
604-
impl_args += ["--skip-build-cygwin"]
605-
if not args.build_osx:
606-
impl_args += ["--skip-build-osx"]
607-
if not args.build_ios_device:
608-
impl_args += ["--skip-build-ios-device"]
609-
if not args.build_ios_simulator:
610-
impl_args += ["--skip-build-ios-simulator"]
611-
if not args.build_tvos_device:
612-
impl_args += ["--skip-build-tvos-device"]
613-
if not args.build_tvos_simulator:
614-
impl_args += ["--skip-build-tvos-simulator"]
615-
if not args.build_watchos_device:
616-
impl_args += ["--skip-build-watchos-device"]
617-
if not args.build_watchos_simulator:
618-
impl_args += ["--skip-build-watchos-simulator"]
619596
if not args.build_android:
620597
impl_args += ["--skip-build-android"]
621598
if not args.build_clang_tools_extra:
@@ -633,32 +610,6 @@ class BuildScriptInvocation(object):
633610
"--skip-test-libdispatch",
634611
"--skip-test-libicu",
635612
]
636-
if not args.test_linux:
637-
impl_args += ["--skip-test-linux"]
638-
if not args.test_freebsd:
639-
impl_args += ["--skip-test-freebsd"]
640-
if not args.test_cygwin:
641-
impl_args += ["--skip-test-cygwin"]
642-
if not args.test_osx:
643-
impl_args += ["--skip-test-osx"]
644-
if not args.test_ios_host:
645-
impl_args += ["--skip-test-ios-host"]
646-
if not args.test_ios_simulator:
647-
impl_args += ["--skip-test-ios-simulator"]
648-
if not args.test_ios_32bit_simulator:
649-
impl_args += ["--skip-test-ios-32bit-simulator"]
650-
if not args.test_tvos_host:
651-
impl_args += ["--skip-test-tvos-host"]
652-
if not args.test_tvos_simulator:
653-
impl_args += ["--skip-test-tvos-simulator"]
654-
if not args.test_watchos_host:
655-
impl_args += ["--skip-test-watchos-host"]
656-
if not args.test_watchos_simulator:
657-
impl_args += ["--skip-test-watchos-simulator"]
658-
if not args.test_android:
659-
impl_args += ["--skip-test-android"]
660-
if not args.test_android_host:
661-
impl_args += ["--skip-test-android-host"]
662613
if args.build_runtime_with_host_compiler:
663614
impl_args += ["--build-runtime-with-host-compiler"]
664615
if args.validation_test:
@@ -673,12 +624,6 @@ class BuildScriptInvocation(object):
673624
impl_args += ["--only-executable-test"]
674625
if not args.benchmark:
675626
impl_args += ["--skip-test-benchmarks"]
676-
if not args.test_optimized:
677-
impl_args += ["--skip-test-optimized"]
678-
if not args.test_optimize_for_size:
679-
impl_args += ["--skip-test-optimize-for-size"]
680-
if not args.test_optimize_none_with_implicit_dynamic:
681-
impl_args += ["--skip-test-optimize-none-with-implicit-dynamic"]
682627
if args.build_libparser_only:
683628
impl_args += ["--build-libparser-only"]
684629
if args.android:

‎utils/build-script-impl

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -126,40 +126,9 @@ KNOWN_SETTINGS=(
126126
skip-build-clang-tools-extra "" "set to skip building clang-tools-extra as part of llvm"
127127
skip-build-compiler-rt "" "set to skip building Compiler-RT"
128128
skip-build-lld "" "set to skip building lld as part of llvm (linux only)"
129-
skip-build-cygwin "" "set to skip building Swift stdlibs for Cygwin"
130-
skip-build-external-benchmarks "1" "set to skip building the external Swift Benchmark Suite. (skipped by default)"
131-
skip-build-freebsd "" "set to skip building Swift stdlibs for FreeBSD"
132-
skip-build-haiku "" "set to skip building Swift stdlibs for Haiku"
133-
skip-build-ios-device "" "set to skip building Swift stdlibs for iOS devices (i.e. build simulators only)"
134-
skip-build-ios-simulator "" "set to skip building Swift stdlibs for iOS simulators (i.e. build devices only)"
135-
skip-build-linux "" "set to skip building Swift stdlibs for Linux"
136-
skip-build-maccatalyst "" "set to skip building Swift stdlibs for macCatalyst"
137-
skip-build-osx "" "set to skip building Swift stdlibs for OS X"
138-
skip-build-tvos-device "" "set to skip building Swift stdlibs for tvOS devices (i.e. build simulators only)"
139-
skip-build-tvos-simulator "" "set to skip building Swift stdlibs for tvOS simulators (i.e. build devices only)"
140-
skip-build-watchos-device "" "set to skip building Swift stdlibs for Apple watchOS devices (i.e. build simulators only)"
141-
skip-build-watchos-simulator "" "set to skip building Swift stdlibs for Apple watchOS simulators (i.e. build devices only)"
142129

143130
## Skip Test ...
144-
skip-test-android "" "set to skip testing Swift stdlibs for Android"
145-
skip-test-android-host "" "set to skip testing the host parts of the Android toolchain"
146-
skip-test-cygwin "" "set to skip testing Swift stdlibs for Cygwin"
147-
skip-test-freebsd "" "set to skip testing Swift stdlibs for FreeBSD"
148-
skip-test-haiku "" "set to skip testing Swift stdlibs for Haiku"
149-
skip-test-ios-32bit-simulator "" "set to skip testing Swift stdlibs for iOS 32bit simulators"
150-
skip-test-ios-host "" "set to skip testing the host parts of the iOS toolchain"
151-
skip-test-ios-simulator "" "set to skip testing Swift stdlibs for iOS simulators (i.e. test devices only)"
152-
skip-test-linux "" "set to skip testing Swift stdlibs for Linux"
153-
skip-test-maccatalyst "" "set to skip testing Swift stdlibs for macCatalyst"
154-
skip-test-osx "" "set to skip testing Swift stdlibs for OS X"
155-
skip-test-tvos-host "" "set to skip testing the host parts of the tvOS toolchain"
156-
skip-test-tvos-simulator "" "set to skip testing Swift stdlibs for tvOS simulators (i.e. test devices only)"
157-
skip-test-watchos-host "" "set to skip testing the host parts of the watchOS toolchain"
158-
skip-test-watchos-simulator "" "set to skip testing Swift stdlibs for Apple watchOS simulators (i.e. test devices only)"
159131
skip-test-benchmarks "" "set to skip running Swift Benchmark Suite"
160-
skip-test-optimized "" "set to skip testing the test suite in optimized mode"
161-
skip-test-optimize-for-size "" "set to skip testing the test suite in optimize for size mode"
162-
skip-test-optimize-none-with-implicit-dynamic "" "set to skip testing the test suite in optimize none with implicit dynamic mode"
163132
skip-test-sourcekit "" "set to skip testing SourceKit"
164133

165134
## Extra ... CMake Options

0 commit comments

Comments
 (0)