Skip to content

Commit bbc7b23

Browse files
author
Karim Alweheshy
committed
hardcode rt builtin linking
1 parent 480056f commit bbc7b23

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

tools/generators/pbxnativetargets/src/Generator/CalculatePlatformVariantBuildSettings.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,15 @@ extension Generator.CalculatePlatformVariantBuildSettings {
186186
buildSettings.append(
187187
.init(
188188
key: "LIBRARY_SEARCH_PATHS",
189-
value: platformVariant.librarySearchPaths
190-
.map {
191-
let path = $0.path.split(separator: "/").dropFirst().joined(separator: "/")
192-
return "\"$(BAZEL_OUT)/\(path)\""
193-
}
189+
value: (
190+
platformVariant.librarySearchPaths
191+
.map {
192+
let path = $0.path.split(separator: "/").dropFirst().joined(separator: "/")
193+
return "\"$(BAZEL_OUT)/\(path)\""
194+
} + [
195+
"\"/Applications/Xcode_16.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/16/lib/darwin\""
196+
]
197+
)
194198
.sorted()
195199
.joined(separator: " ")
196200
.pbxProjEscaped

tools/generators/pbxnativetargets/src/Generator/CreateBuildPhases.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,10 @@ extension Generator.CreateBuildPhases {
281281
)
282282
}
283283

284-
let librariesToLinkSubIdentifiers = consolidatedInputs.librariesToLinkPaths.map { bazelPath in
284+
let libs = consolidatedInputs.librariesToLinkPaths + [
285+
"/Applications/Xcode_16.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/16/lib/darwin/libclang_rt.iossim.a"
286+
]
287+
let librariesToLinkSubIdentifiers = libs.map { bazelPath in
285288
return (
286289
bazelPath,
287290
createBuildFileSubIdentifier(

0 commit comments

Comments
 (0)