Skip to content

Commit f856933

Browse files
iinozemtsevCommit Queue
authored andcommitted
Fix toolchain_os in ios toolchain definitions
I think it worked correctly before only by accident, because of the fallback to `target_os` in build config: https://github.com/dart-lang/sdk/blob/0906af6d2f6cf8ae1eff52a93adccdaf90d13443/build/config/BUILDCONFIG.gn#L48). However when buildconfig is re-evaluated with toolchain args, current_os is set to a toolchain_os at https://github.com/dart-lang/sdk/blob/0906af6d2f6cf8ae1eff52a93adccdaf90d13443/build/toolchain/mac/BUILD.gn#L260, which causes linking issues in https://dart-review.googlesource.com/c/sdk/+/392661 (https://ci.chromium.org/ui/p/dart/builders/try/vm-mac-debug-arm64-try/12692/overview). Change-Id: I9c6129ad40a7ec26fde47816810241850b6f816f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395300 Auto-Submit: Ivan Inozemtsev <[email protected]> Reviewed-by: Slava Egorov <[email protected]> Commit-Queue: Slava Egorov <[email protected]>
1 parent e239f74 commit f856933

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build/toolchain/mac/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ template("mac_toolchain") {
273273
# Toolchain used for iOS device targets.
274274
mac_toolchain("ios_clang_arm64") {
275275
toolchain_cpu = "arm64"
276-
toolchain_os = "mac"
276+
toolchain_os = "ios"
277277
prefix = rebased_clang_dir
278278
cc = "${compiler_prefix}${prefix}/clang"
279279
cxx = "${compiler_prefix}${prefix}/clang++"
@@ -296,7 +296,7 @@ mac_toolchain("ios_clang_arm64") {
296296
# Toolchain used for iOS simulator targets (arm64).
297297
mac_toolchain("ios_clang_arm64_sim") {
298298
toolchain_cpu = "arm64"
299-
toolchain_os = "mac"
299+
toolchain_os = "ios"
300300
prefix = rebased_clang_dir
301301
cc = "${compiler_prefix}${prefix}/clang"
302302
cxx = "${compiler_prefix}${prefix}/clang++"
@@ -320,7 +320,7 @@ mac_toolchain("ios_clang_arm64_sim") {
320320
# Toolchain used for iOS simulator targets (x64).
321321
mac_toolchain("ios_clang_x64_sim") {
322322
toolchain_cpu = "x64"
323-
toolchain_os = "mac"
323+
toolchain_os = "ios"
324324
prefix = rebased_clang_dir
325325
cc = "${compiler_prefix}${prefix}/clang"
326326
cxx = "${compiler_prefix}${prefix}/clang++"

0 commit comments

Comments
 (0)