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

Commit

Permalink
Support Bazel 3.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
koenvervloesem committed Oct 15, 2020
1 parent 0dbd999 commit d270529
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion BAZEL_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.5.1
3.6.0
33 changes: 33 additions & 0 deletions patches/bazel-3.6.0-arm.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff -ruN bazel/tools/cpp/unix_cc_configure.bzl bazel-2/tools/cpp/unix_cc_configure.bzl
--- bazel/tools/cpp/unix_cc_configure.bzl 1980-01-01 00:00:00.000000000 +0000
+++ bazel-2/tools/cpp/unix_cc_configure.bzl 2020-09-03 07:54:55.451191062 +0100
@@ -392,7 +392,7 @@
False,
), ":")

- bazel_linkopts = "-lstdc++:-lm"
+ bazel_linkopts = "-lstdc++:-lm -latomic"
bazel_linklibs = ""
if repository_ctx.flag_enabled("incompatible_linkopts_to_linklibs"):
bazel_linkopts, bazel_linklibs = bazel_linklibs, bazel_linkopts
diff -ruN bazel/tools/jdk/BUILD bazel-2/tools/jdk/BUILD
--- bazel/tools/jdk/BUILD 1980-01-01 00:00:00.000000000 +0000
+++ bazel-2/tools/jdk/BUILD 2020-09-03 07:56:13.139831359 +0100
@@ -142,7 +142,7 @@
"//src/conditions:freebsd": [":jni_md_header-freebsd"],
"//src/conditions:openbsd": [":jni_md_header-openbsd"],
"//src/conditions:windows": [":jni_md_header-windows"],
- "//conditions:default": [],
+ "//conditions:default": [":jni_md_header-linux"],
}),
includes = ["include"] + select({
"//src/conditions:linux_aarch64": ["include/linux"],
@@ -153,7 +153,7 @@
"//src/conditions:freebsd": ["include/freebsd"],
"//src/conditions:openbsd": ["include/openbsd"],
"//src/conditions:windows": ["include/win32"],
- "//conditions:default": [],
+ "//conditions:default": ["include/linux"],
}),
)

0 comments on commit d270529

Please sign in to comment.