Skip to content

Commit 2b92530

Browse files
authored
Merge pull request #9780 from milseman/the_missing_link
[stubs] Autolink against icucore on Darwin.
2 parents 643d913 + 8e0362e commit 2b92530

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

lib/Driver/ToolChains.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,6 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
12371237
getRuntimeStaticLibraryPath(StaticRuntimeLibPath, context.Args, *this);
12381238
Arguments.push_back(context.Args.MakeArgString(StaticRuntimeLibPath));
12391239
Arguments.push_back("-lc++");
1240-
Arguments.push_back("-licucore");
12411240
Arguments.push_back("-framework");
12421241
Arguments.push_back("Foundation");
12431242
Arguments.push_back("-force_load_swift_libs");

stdlib/public/stubs/UnicodeNormalization.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ int32_t ubrk_preceding(UBreakIterator *, int32_t);
317317
int32_t ubrk_following(UBreakIterator *, int32_t);
318318
void ubrk_setText(UBreakIterator *, const UChar *, int32_t, UErrorCode *);
319319
}
320+
321+
// Force an autolink with ICU
322+
asm(".linker_option \"-licucore\"\n");
323+
320324
#endif // defined(__APPLE__)
321325

322326
void swift::__swift_stdlib_ubrk_close(

test/Driver/static-stdlib-icu.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)