Skip to content

Commit 329d00a

Browse files
authored
Switch to upstream apple config_settings (#1053)
Fixes #1052
1 parent 24af9f7 commit 329d00a

File tree

2 files changed

+2
-126
lines changed

2 files changed

+2
-126
lines changed

swift/internal/BUILD

Lines changed: 1 addition & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
2-
load("@bazel_skylib//lib:selects.bzl", "selects")
32

43
licenses(["notice"])
54

@@ -426,134 +425,11 @@ bzl_library(
426425
srcs = ["build_settings.bzl"],
427426
)
428427

429-
# `config_setting`s to allow for `swizzle_absolute_xcttestsourcelocation` to
430-
# only resolve to an `objc_library` on Apple platforms
431-
432-
config_setting(
433-
name = "catalyst_x86_64",
434-
values = {"cpu": "catalyst_x86_64"},
435-
)
436-
437-
config_setting(
438-
name = "darwin",
439-
values = {"cpu": "darwin"},
440-
)
441-
442-
config_setting(
443-
name = "darwin_x86_64",
444-
values = {"cpu": "darwin_x86_64"},
445-
)
446-
447-
config_setting(
448-
name = "darwin_arm64",
449-
values = {"cpu": "darwin_arm64"},
450-
)
451-
452-
config_setting(
453-
name = "ios_i386",
454-
values = {"cpu": "ios_i386"},
455-
)
456-
457-
config_setting(
458-
name = "ios_x86_64",
459-
values = {"cpu": "ios_x86_64"},
460-
)
461-
462-
config_setting(
463-
name = "ios_armv7",
464-
values = {"cpu": "ios_armv7"},
465-
)
466-
467-
config_setting(
468-
name = "ios_armv7s",
469-
values = {"cpu": "ios_armv7s"},
470-
)
471-
472-
config_setting(
473-
name = "ios_arm64",
474-
values = {"cpu": "ios_arm64"},
475-
)
476-
477-
config_setting(
478-
name = "ios_arm64e",
479-
values = {"cpu": "ios_arm64e"},
480-
)
481-
482-
config_setting(
483-
name = "ios_sim_arm64",
484-
values = {"cpu": "ios_sim_arm64"},
485-
)
486-
487-
config_setting(
488-
name = "watchos_arm64",
489-
values = {"cpu": "watchos_arm64"},
490-
)
491-
492-
config_setting(
493-
name = "watchos_arm64_32",
494-
values = {"cpu": "watchos_arm64_32"},
495-
)
496-
497-
config_setting(
498-
name = "watchos_armv7k",
499-
values = {"cpu": "watchos_armv7k"},
500-
)
501-
502-
config_setting(
503-
name = "watchos_i386",
504-
values = {"cpu": "watchos_i386"},
505-
)
506-
507-
config_setting(
508-
name = "watchos_x86_64",
509-
values = {"cpu": "watchos_x86_64"},
510-
)
511-
512-
config_setting(
513-
name = "tvos_arm64",
514-
values = {"cpu": "tvos_arm64"},
515-
)
516-
517-
config_setting(
518-
name = "tvos_sim_arm64",
519-
values = {"cpu": "tvos_sim_arm64"},
520-
)
521-
522-
config_setting(
523-
name = "tvos_x86_64",
524-
values = {"cpu": "tvos_x86_64"},
525-
)
526-
527-
selects.config_setting_group(
528-
name = "apple",
529-
match_any = [
530-
":catalyst_x86_64",
531-
":darwin",
532-
":darwin_arm64",
533-
":darwin_x86_64",
534-
":ios_arm64",
535-
":ios_arm64e",
536-
":ios_armv7",
537-
":ios_armv7s",
538-
":ios_i386",
539-
":ios_sim_arm64",
540-
":ios_x86_64",
541-
":watchos_arm64",
542-
":watchos_arm64_32",
543-
":watchos_armv7k",
544-
":watchos_i386",
545-
":watchos_x86_64",
546-
":tvos_arm64",
547-
":tvos_sim_arm64",
548-
":tvos_x86_64",
549-
],
550-
)
551-
552428
# Indirection needed to prevent using `objc_library` outside of macOS
553429
alias(
554430
name = "swizzle_absolute_xcttestsourcelocation",
555431
actual = select({
556-
":apple": (
432+
"@build_bazel_apple_support//configs:apple": (
557433
"@build_bazel_apple_support//lib:swizzle_absolute_xcttestsourcelocation"
558434
),
559435
"//conditions:default": ":dummy_swizzle_absolute_xcttestsourcelocation",

tools/worker/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ cc_library(
7575
],
7676
}),
7777
data = select({
78-
"//swift/internal:apple": [
78+
"@build_bazel_apple_support//configs:apple": [
7979
"@build_bazel_rules_swift_index_import//:index_import",
8080
],
8181
"//conditions:default": [],

0 commit comments

Comments
 (0)