Skip to content

Commit

Permalink
Fix toolchain_os in ios toolchain definitions
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
iinozemtsev authored and Commit Queue committed Nov 14, 2024
1 parent e239f74 commit f856933
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build/toolchain/mac/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ template("mac_toolchain") {
# Toolchain used for iOS device targets.
mac_toolchain("ios_clang_arm64") {
toolchain_cpu = "arm64"
toolchain_os = "mac"
toolchain_os = "ios"
prefix = rebased_clang_dir
cc = "${compiler_prefix}${prefix}/clang"
cxx = "${compiler_prefix}${prefix}/clang++"
Expand All @@ -296,7 +296,7 @@ mac_toolchain("ios_clang_arm64") {
# Toolchain used for iOS simulator targets (arm64).
mac_toolchain("ios_clang_arm64_sim") {
toolchain_cpu = "arm64"
toolchain_os = "mac"
toolchain_os = "ios"
prefix = rebased_clang_dir
cc = "${compiler_prefix}${prefix}/clang"
cxx = "${compiler_prefix}${prefix}/clang++"
Expand All @@ -320,7 +320,7 @@ mac_toolchain("ios_clang_arm64_sim") {
# Toolchain used for iOS simulator targets (x64).
mac_toolchain("ios_clang_x64_sim") {
toolchain_cpu = "x64"
toolchain_os = "mac"
toolchain_os = "ios"
prefix = rebased_clang_dir
cc = "${compiler_prefix}${prefix}/clang"
cxx = "${compiler_prefix}${prefix}/clang++"
Expand Down

0 comments on commit f856933

Please sign in to comment.