Skip to content

Commit 63a71db

Browse files
committed
Fix ubuntu-bazel.
1 parent 8ebae02 commit 63a71db

5 files changed

Lines changed: 28 additions & 7 deletions

File tree

.github/workflows/ubuntu-bazel.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
run: |
2525
sudo apt -y install clang llvm
2626
./bazel/setup_clang.sh
27-
echo 'build --linkopt="-z nostart-stop-gc"' >> "${GITHUB_WORKSPACE}/.bazelrc.local"
28-
echo 'build --host_linkopt="-z nostart-stop-gc"' >> "${GITHUB_WORKSPACE}/.bazelrc.local"
2927
3028
- name: Run tests
3129
run: |

external/swift-atomics.BUILD

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
1+
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library", "swift_interop_hint")
22

33
cc_library(
44
name = "_AtomicsShims",
@@ -8,6 +8,12 @@ cc_library(
88
"Sources/_AtomicsShims/include/",
99
],
1010
tags = ["swift_module=_AtomicsShims"],
11+
aspect_hints = [":AtomicsShims_swift_interop"],
12+
)
13+
14+
swift_interop_hint(
15+
name = "AtomicsShims_swift_interop",
16+
module_name = "AtomicsShims",
1117
)
1218

1319
swift_library(

external/swift-syntax.BUILD

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
2-
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
1+
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library", "swift_interop_hint")
32

43
cc_library(
54
name = "_CSwiftSyntax",
@@ -12,6 +11,12 @@ cc_library(
1211
"Sources/_CSwiftSyntax/include/",
1312
],
1413
tags = ["swift_module=_CSwiftSyntax"],
14+
aspect_hints = [":CSwiftSyntax_swift_interop"],
15+
)
16+
17+
swift_interop_hint(
18+
name = "CSwiftSyntax_swift_interop",
19+
module_name = "CSwiftSyntax",
1520
)
1621

1722
swift_library(

external/swift-system.BUILD

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
1+
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library", "swift_interop_hint")
22

33
cc_library(
44
name = "CSystem",
@@ -10,6 +10,12 @@ cc_library(
1010
"Sources/CSystem/include/",
1111
],
1212
tags = ["swift_module=CSystem"],
13+
aspect_hints = [":CSystem_swift_interop"],
14+
)
15+
16+
swift_interop_hint(
17+
name = "CSystem_swift_interop",
18+
module_name = "CSystem",
1319
)
1420

1521
swift_library(

external/swift-tools-support-core.BUILD

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
1+
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library", "swift_interop_hint")
22

33
cc_library(
44
name = "TSCclibc",
@@ -10,6 +10,12 @@ cc_library(
1010
"Sources/TSCclibc/include/",
1111
],
1212
tags = ["swift_module=TSCclibc"],
13+
aspect_hints = [":TSCclibc_swift_interop"],
14+
)
15+
16+
swift_interop_hint(
17+
name = "TSCclibc_swift_interop",
18+
module_name = "TSCclibc",
1319
)
1420

1521
swift_library(

0 commit comments

Comments
 (0)