File tree Expand file tree Collapse file tree 2 files changed +10
-17
lines changed Expand file tree Collapse file tree 2 files changed +10
-17
lines changed Original file line number Diff line number Diff line change @@ -5,11 +5,7 @@ def _wrap_cc(rule, kwargs):
5
5
_add_args (kwargs , "copts" , [
6
6
# Required by LLVM/Swift
7
7
"-fno-rtti" ,
8
- ] + select ({
9
- # temporary, before we do universal merging and have an arm prebuilt package, we make arm build x86
10
- "@platforms//os:macos" : ["-arch=x86_64" ],
11
- "//conditions:default" : [],
12
- }))
8
+ ])
13
9
_add_args (kwargs , "features" , [
14
10
# temporary, before we do universal merging
15
11
"-universal_binaries" ,
Original file line number Diff line number Diff line change 1
1
package (default_visibility = ["//swift:__subpackages__" ])
2
2
3
3
#TODO we will be introducing universal binaries at a later stage, when we have both architectures prebuilt for macOS
4
- # for the moment, we make arm build an x86_64 binary
5
- _arch_override = {
6
- "darwin_arm64" : "darwin_x86_64" ,
7
- }
8
-
4
+ # for the moment, we require --cpu=darwin_x86_64 on an ARM macOS
9
5
[
10
6
alias (
11
7
name = name ,
12
- actual = select ({
13
- "@bazel_tools//src/conditions:%s" % arch : "@swift_prebuilt_%s//:%s" % (
14
- _arch_override .get (arch , arch ),
15
- name ,
16
- )
17
- for arch in ("linux" , "darwin_x86_64" , "darwin_arm64" )
18
- }),
8
+ actual = select (
9
+ {
10
+ "@bazel_tools//src/conditions:%s" % arch : "@swift_prebuilt_%s//:%s" % (arch , name )
11
+ for arch in ("linux" , "darwin_x86_64" )
12
+ },
13
+ no_match_error = "Unsupported platform. Support for the ARM macOS platform is still a todo, " +
14
+ "please pass --cpu=darwin_x86_64 for the time being" ,
15
+ ),
19
16
)
20
17
for name in ("swift-llvm-support" , "swift-test-sdk" )
21
18
]
You can’t perform that action at this time.
0 commit comments