Skip to content
This repository was archived by the owner on Mar 18, 2023. It is now read-only.

Commit 6d2fb16

Browse files
Support Bazel 4.2.1
1 parent 6d0d2e3 commit 6d2fb16

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

BAZEL_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.0
1+
4.2.1

patches/bazel-4.2.1-arm.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff -ruN bazel/tools/cpp/unix_cc_configure.bzl bazel-2/tools/cpp/unix_cc_configure.bzl
2+
--- bazel/tools/cpp/unix_cc_configure.bzl 1980-01-01 00:00:00.000000000 +0000
3+
+++ bazel-2/tools/cpp/unix_cc_configure.bzl 2021-01-21 08:34:29.980980647 +0000
4+
@@ -388,7 +388,7 @@
5+
False,
6+
), ":")
7+
8+
- bazel_linkopts = "-lstdc++:-lm"
9+
+ bazel_linkopts = "-lstdc++:-lm -latomic"
10+
bazel_linklibs = ""
11+
if repository_ctx.flag_enabled("incompatible_linkopts_to_linklibs"):
12+
bazel_linkopts, bazel_linklibs = bazel_linklibs, bazel_linkopts
13+
diff -ruN bazel/tools/jdk/BUILD bazel-2/tools/jdk/BUILD
14+
--- bazel/tools/jdk/BUILD 1980-01-01 00:00:00.000000000 +0000
15+
+++ bazel-2/tools/jdk/BUILD 2021-01-21 08:35:35.219698682 +0000
16+
@@ -145,7 +145,7 @@
17+
"//src/conditions:freebsd": [":jni_md_header-freebsd"],
18+
"//src/conditions:openbsd": [":jni_md_header-openbsd"],
19+
"//src/conditions:windows": [":jni_md_header-windows"],
20+
- "//conditions:default": [],
21+
+ "//conditions:default": [":jni_md_header-linux"],
22+
}),
23+
includes = ["include"] + select({
24+
"//src/conditions:linux_aarch64": ["include/linux"],
25+
@@ -156,7 +156,7 @@
26+
"//src/conditions:freebsd": ["include/freebsd"],
27+
"//src/conditions:openbsd": ["include/openbsd"],
28+
"//src/conditions:windows": ["include/win32"],
29+
- "//conditions:default": [],
30+
+ "//conditions:default": ["include/linux"],
31+
}),
32+
)
33+

0 commit comments

Comments
 (0)