Skip to content

Commit 0e37ada

Browse files
authored
Merge pull request swiftlang#40954 from etcwilde/ewilde/remove-libcxx-from-linux-build
Don't build Libcxx on Linux
2 parents 1bf9f42 + e2c5f9b commit 0e37ada

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

utils/build-presets.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,6 @@ swiftpm
819819
swift-driver
820820
xctest
821821
libicu
822-
libcxx
823822
swiftdocc
824823

825824
build-ninja
@@ -832,7 +831,6 @@ install-swift-driver
832831
install-xctest
833832
install-libicu
834833
install-prefix=/usr
835-
install-libcxx
836834
install-sourcekit-lsp
837835
install-swiftdocc
838836
build-swift-static-stdlib
@@ -921,7 +919,6 @@ test-optimized
921919
lit-args=-v --time-tests
922920

923921
build-ninja
924-
libcxx
925922

926923
android
927924
android-ndk=%(ndk_path)s
@@ -941,7 +938,6 @@ host-test
941938
install-prefix=/usr
942939
install-llvm
943940
install-swift
944-
install-libcxx
945941

946942
skip-test-linux
947943
skip-build-benchmarks
@@ -1100,7 +1096,6 @@ mixin-preset=
11001096
mixin_linux_install_components_with_clang
11011097
build-subdir=buildbot_incremental
11021098

1103-
libcxx
11041099
libicu
11051100
llbuild
11061101
swiftpm
@@ -1121,7 +1116,6 @@ install-swift-driver
11211116
install-foundation
11221117
install-libdispatch
11231118
install-xctest
1124-
install-libcxx
11251119

11261120
[preset: buildbot_incremental_linux,long_test]
11271121
mixin-preset=buildbot_incremental_linux
@@ -1669,6 +1663,7 @@ libdispatch
16691663
libicu
16701664
foundation
16711665
xctest
1666+
libcxx=false
16721667

16731668
install-libicu
16741669
install-foundation

0 commit comments

Comments
 (0)