diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java index 404d6ea8e67a7f..5896707eb1be66 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java @@ -459,7 +459,7 @@ public static CcToolchainConfig.Builder watchos_armv7k() { .withCompiler("compiler") .withToolchainIdentifier("watchos_armv7k") .withHostSystemName("x86_64-apple-ios") - .withTargetSystemName("armv7-apple-watchos") + .withTargetSystemName("armv7k-apple-watchos") .withTargetLibc("watchos") .withAbiVersion("local") .withAbiLibcVersion("local") diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl index cca9178cdc3cf3..a453098fbee7d0 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl +++ b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl @@ -6991,7 +6991,7 @@ def _impl(ctx): actions = _ALL_LINK_ACTIONS, flag_groups = [ flag_group( - flags = ["-lc++", "-target", "armv7-apple-watchos"], + flags = ["-lc++", "-target", "armv7k-apple-watchos"], ), ], ), diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl b/tools/osx/crosstool/cc_toolchain_config.bzl index b3a6240d62eb99..d5ec734d81a453 100644 --- a/tools/osx/crosstool/cc_toolchain_config.bzl +++ b/tools/osx/crosstool/cc_toolchain_config.bzl @@ -67,7 +67,7 @@ def _impl(ctx): elif (ctx.attr.cpu == "ios_armv7"): target_system_name = "armv7-apple-ios" elif (ctx.attr.cpu == "watchos_armv7k"): - target_system_name = "armv7-apple-watchos" + target_system_name = "armv7k-apple-watchos" elif (ctx.attr.cpu == "ios_i386"): target_system_name = "i386-apple-ios" elif (ctx.attr.cpu == "watchos_i386"):