Skip to content

Commit 3570275

Browse files
gferongferon
committed
Merge remote-tracking branch 'origin/master' into use-cc-toolchain-config-for-swift
2 parents 8a0a9c9 + 22b7ffa commit 3570275

7 files changed

+46
-39
lines changed

‎MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module(
77
)
88

99
bazel_dep(name = "bazel_skylib", version = "1.3.0")
10-
bazel_dep(name = "apple_support", version = "1.9.0", repo_name = "build_bazel_apple_support")
10+
bazel_dep(name = "apple_support", version = "1.10.1", repo_name = "build_bazel_apple_support")
1111
bazel_dep(name = "rules_cc", version = "0.0.2")
1212
bazel_dep(name = "platforms", version = "0.0.7")
1313
bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf")

‎platform_mappings_bzlmod

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,137 @@
11
platforms:
2-
@@apple_support~1.9.0//platforms:macos_x86_64
2+
@@apple_support~1.10.1//platforms:macos_x86_64
33
--apple_platform_type=macos
44
--cpu=darwin_x86_64
55

6-
@@apple_support~1.9.0//platforms:macos_arm64
6+
@@apple_support~1.10.1//platforms:macos_arm64
77
--apple_platform_type=macos
88
--cpu=darwin_arm64
99

10-
@@apple_support~1.9.0//platforms:darwin_arm64e
10+
@@apple_support~1.10.1//platforms:darwin_arm64e
1111
--apple_platform_type=macos
1212
--cpu=darwin_arm64e
1313

14-
@@apple_support~1.9.0//platforms:ios_i386
14+
@@apple_support~1.10.1//platforms:ios_i386
1515
--apple_platform_type=ios
1616
--cpu=ios_i386
1717

18-
@@apple_support~1.9.0//platforms:ios_x86_64
18+
@@apple_support~1.10.1//platforms:ios_x86_64
1919
--apple_platform_type=ios
2020
--cpu=ios_x86_64
2121

22-
@@apple_support~1.9.0//platforms:ios_sim_arm64
22+
@@apple_support~1.10.1//platforms:ios_sim_arm64
2323
--apple_platform_type=ios
2424
--cpu=ios_sim_arm64
2525

26-
@@apple_support~1.9.0//platforms:ios_armv7
26+
@@apple_support~1.10.1//platforms:ios_armv7
2727
--apple_platform_type=ios
2828
--cpu=ios_armv7
2929

30-
@@apple_support~1.9.0//platforms:ios_arm64
30+
@@apple_support~1.10.1//platforms:ios_arm64
3131
--apple_platform_type=ios
3232
--cpu=ios_arm64
3333

34-
@@apple_support~1.9.0//platforms:ios_arm64e
34+
@@apple_support~1.10.1//platforms:ios_arm64e
3535
--apple_platform_type=ios
3636
--cpu=ios_arm64e
3737

38-
@@apple_support~1.9.0//platforms:tvos_x86_64
38+
@@apple_support~1.10.1//platforms:tvos_x86_64
3939
--apple_platform_type=tvos
4040
--cpu=tvos_x86_64
4141

42-
@@apple_support~1.9.0//platforms:tvos_sim_arm64
42+
@@apple_support~1.10.1//platforms:tvos_sim_arm64
4343
--apple_platform_type=tvos
4444
--cpu=tvos_sim_arm64
4545

46-
@@apple_support~1.9.0//platforms:tvos_arm64
46+
@@apple_support~1.10.1//platforms:tvos_arm64
4747
--apple_platform_type=tvos
4848
--cpu=tvos_arm64
4949

50-
@@apple_support~1.9.0//platforms:watchos_i386
50+
@@apple_support~1.10.1//platforms:watchos_i386
5151
--apple_platform_type=watchos
5252
--cpu=watchos_i386
5353

54-
@@apple_support~1.9.0//platforms:watchos_x86_64
54+
@@apple_support~1.10.1//platforms:watchos_x86_64
5555
--apple_platform_type=watchos
5656
--cpu=watchos_x86_64
5757

58-
@@apple_support~1.9.0//platforms:watchos_arm64
58+
@@apple_support~1.10.1//platforms:watchos_arm64
5959
--apple_platform_type=watchos
6060
--cpu=watchos_arm64
6161

62-
@@apple_support~1.9.0//platforms:watchos_armv7k
62+
@@apple_support~1.10.1//platforms:watchos_armv7k
6363
--apple_platform_type=watchos
6464
--cpu=watchos_armv7k
6565

66-
@@apple_support~1.9.0//platforms:watchos_arm64_32
66+
@@apple_support~1.10.1//platforms:watchos_arm64_32
6767
--apple_platform_type=watchos
6868
--cpu=watchos_arm64_32
6969

7070
flags:
7171
--cpu=darwin_x86_64
7272
--apple_platform_type=macos
73-
@@apple_support~1.9.0//platforms:macos_x86_64
73+
@@apple_support~1.10.1//platforms:macos_x86_64
7474

7575
--cpu=darwin_arm64
7676
--apple_platform_type=macos
77-
@@apple_support~1.9.0//platforms:macos_arm64
77+
@@apple_support~1.10.1//platforms:macos_arm64
7878

7979
--cpu=darwin_arm64e
8080
--apple_platform_type=macos
81-
@@apple_support~1.9.0//platforms:darwin_arm64e
81+
@@apple_support~1.10.1//platforms:darwin_arm64e
8282

8383
--cpu=ios_i386
8484
--apple_platform_type=ios
85-
@@apple_support~1.9.0//platforms:ios_i386
85+
@@apple_support~1.10.1//platforms:ios_i386
8686

8787
--cpu=ios_x86_64
8888
--apple_platform_type=ios
89-
@@apple_support~1.9.0//platforms:ios_x86_64
89+
@@apple_support~1.10.1//platforms:ios_x86_64
9090

9191
--cpu=ios_sim_arm64
9292
--apple_platform_type=ios
93-
@@apple_support~1.9.0//platforms:ios_sim_arm64
93+
@@apple_support~1.10.1//platforms:ios_sim_arm64
9494

9595
--cpu=ios_armv7
9696
--apple_platform_type=ios
97-
@@apple_support~1.9.0//platforms:ios_armv7
97+
@@apple_support~1.10.1//platforms:ios_armv7
9898

9999
--cpu=ios_arm64
100100
--apple_platform_type=ios
101-
@@apple_support~1.9.0//platforms:ios_arm64
101+
@@apple_support~1.10.1//platforms:ios_arm64
102102

103103
--cpu=ios_arm64e
104104
--apple_platform_type=ios
105-
@@apple_support~1.9.0//platforms:ios_arm64e
105+
@@apple_support~1.10.1//platforms:ios_arm64e
106106

107107
--cpu=tvos_x86_64
108108
--apple_platform_type=tvos
109-
@@apple_support~1.9.0//platforms:tvos_x86_64
109+
@@apple_support~1.10.1//platforms:tvos_x86_64
110110

111111
--cpu=tvos_sim_arm64
112112
--apple_platform_type=tvos
113-
@@apple_support~1.9.0//platforms:tvos_sim_arm64
113+
@@apple_support~1.10.1//platforms:tvos_sim_arm64
114114

115115
--cpu=tvos_arm64
116116
--apple_platform_type=tvos
117-
@@apple_support~1.9.0//platforms:tvos_arm64
117+
@@apple_support~1.10.1//platforms:tvos_arm64
118118

119119
--cpu=watchos_i386
120120
--apple_platform_type=watchos
121-
@@apple_support~1.9.0//platforms:watchos_i386
121+
@@apple_support~1.10.1//platforms:watchos_i386
122122

123123
--cpu=watchos_x86_64
124124
--apple_platform_type=watchos
125-
@@apple_support~1.9.0//platforms:watchos_x86_64
125+
@@apple_support~1.10.1//platforms:watchos_x86_64
126126

127127
--cpu=watchos_arm64
128128
--apple_platform_type=watchos
129-
@@apple_support~1.9.0//platforms:watchos_arm64
129+
@@apple_support~1.10.1//platforms:watchos_arm64
130130

131131
--cpu=watchos_armv7k
132132
--apple_platform_type=watchos
133-
@@apple_support~1.9.0//platforms:watchos_armv7k
133+
@@apple_support~1.10.1//platforms:watchos_armv7k
134134

135135
--cpu=watchos_arm64_32
136136
--apple_platform_type=watchos
137-
@@apple_support~1.9.0//platforms:watchos_arm64_32
137+
@@apple_support~1.10.1//platforms:watchos_arm64_32

‎swift/internal/actions.bzl

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ load("@bazel_skylib//lib:types.bzl", "types")
1919
load(":features.bzl", "are_all_features_enabled")
2020
load(":toolchain_config.bzl", "swift_toolchain_config")
2121

22+
# This is a proxy for being on bazel 7.x which has
23+
# --incompatible_merge_fixed_and_default_shell_env enabled by default
24+
USE_DEFAULT_SHELL_ENV = not hasattr(apple_common, "apple_crosstool_transition")
25+
2226
# The names of actions currently supported by the Swift build rules.
2327
swift_action_names = struct(
2428
# Extracts a linker input file containing libraries to link from a compiled
@@ -269,5 +273,6 @@ def run_toolchain_action(
269273
),
270274
mnemonic = mnemonic if mnemonic else action_name,
271275
tools = depset(tools, transitive = [tool_config.tool_inputs]),
276+
use_default_shell_env = USE_DEFAULT_SHELL_ENV,
272277
**kwargs
273278
)

‎swift/internal/swift_grpc_library.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ load(":providers.bzl", "SwiftInfo", "SwiftProtoInfo", "SwiftToolchainInfo")
3737
load(":swift_common.bzl", "swift_common")
3838
load(":transitions.bzl", "proto_compiler_transition")
3939
load(":utils.bzl", "compact", "get_providers")
40+
load(":actions.bzl", "USE_DEFAULT_SHELL_ENV")
4041

4142
def _register_grpcswift_generate_action(
4243
label,
@@ -187,6 +188,7 @@ def _register_grpcswift_generate_action(
187188
mnemonic = "ProtocGenSwiftGRPC",
188189
outputs = generated_files,
189190
progress_message = "Generating Swift sources for %{label}",
191+
use_default_shell_env = USE_DEFAULT_SHELL_ENV,
190192
)
191193

192194
return generated_files

‎swift/internal/swift_protoc_gen_aspect.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ load(
3838
load(":providers.bzl", "SwiftInfo", "SwiftProtoInfo", "SwiftToolchainInfo")
3939
load(":swift_common.bzl", "swift_common")
4040
load(":utils.bzl", "get_providers")
41+
load(":actions.bzl", "USE_DEFAULT_SHELL_ENV")
4142

4243
# The paths of proto files bundled with the runtime. This is mainly the well
4344
# known type protos, but also includes descriptor.proto to make generation of
@@ -234,6 +235,7 @@ def _register_pbswift_generate_action(
234235
protoc_executable,
235236
protoc_plugin_executable,
236237
],
238+
use_default_shell_env = USE_DEFAULT_SHELL_ENV,
237239
)
238240

239241
return generated_files

‎swift/module_name.bzl

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
load("@bazel_skylib//lib:types.bzl", "types")
1818

19-
visibility("public")
20-
2119
def derive_swift_module_name(*args):
2220
"""Returns a derived module name from the given build label.
2321

‎swift/repositories.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ def swift_rules_dependencies(include_bzlmod_ready_dependencies = True):
5757
_maybe(
5858
http_archive,
5959
name = "build_bazel_apple_support",
60-
url = "https://github.com/bazelbuild/apple_support/releases/download/1.9.0/apple_support.1.9.0.tar.gz",
61-
sha256 = "b506c67200a6a64476b5615db20c887a0ff33128acaa3148a5c9e5167c4a075e",
60+
url = "https://github.com/bazelbuild/apple_support/releases/download/1.10.1/apple_support.1.10.1.tar.gz",
61+
sha256 = "62cb8c6658739d22986bbe4b025fe9f0f42cce91394096dc85d64b120ccde229",
6262
)
6363

6464
_maybe(

0 commit comments

Comments
 (0)