[build] Remove last vestiges of ICU for anything other than Foundation #40659
Conversation
finagolfin
force-pushed
the
stdlib-remove-icu
branch
from
114b967 to
8d08b4b
Compare
| # Don't add the icucore target. | ||
| set(SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU) | ||
| foreach(item ${SWIFTLIB_SINGLE_LINK_LIBRARIES}) | ||
| if(NOT "${item}" STREQUAL "icucore") |
There was a problem hiding this comment.
I think this was only needed because of this?
There was a problem hiding this comment.
Yes, this was for filtering out icucore which was being added. Removing the filtering is fine.
|
The referenced bits for Windows I think need to stay for a little bit as it may potentially interact with dispatch. I'll look into that separately. |
|
This looks awesome, thank you so much! |
| "Path to a directory containing headers icui18n for ${sdk}") | ||
| endforeach() | ||
| endforeach() | ||
|
|
There was a problem hiding this comment.
I thought that @Azoy removed this in the initial pass?
There was a problem hiding this comment.
Looks like he just left this definition in because otherwise all these build-script-related inputs that you told him not to worry about wouldmay have errored, which I'm now finally removing.
|
@swift-ci please test |
| @@ -98,7 +97,6 @@ def get_dependencies(cls): | |||
| return [cmark.CMark, | |||
| llvm.LLVM, | |||
| libcxx.LibCXX, | |||
| libicu.LibICU, | |||
There was a problem hiding this comment.
Hold up, I made a mistake: this still needs libicu because it builds Foundation. I'll push a fix.
finagolfin
force-pushed
the
stdlib-remove-icu
branch
from
8d08b4b to
50ac79f
Compare
finagolfin
force-pushed
the
stdlib-remove-icu
branch
from
50ac79f to
2890d15
Compare
|
@MaxDesiatov, would you run the CI and merge? |
|
@swift-ci test |
|
Build failed |
|
Linux test failures appear unrelated, maybe caused by |
|
Perhaps we just need a clean run at it @swift-ci please clean test Linux |
|
Build failed |
|
Single new test failure on the linux CI this time, looks like another flake. |
|
We know of this one internally as rdar://86041709. I will disable this test shortly. |
|
@artemcm, would you run the linux CI again? |
|
@swift-ci please test Linux platform |
|
@CodaFi, passed CI, ready for merge. |
This is a follow-on to #40340 and the Android-specific pull #40625, removing a little remaining build-related config, adjusting the doc, and enabling a few tests.
Two instances I was unsure about:
@Azoy, I don't know if you were planning to remove these soon, thought I'd help chuck it out. 😃