From d270529e127b856894a456033e3031400010c047 Mon Sep 17 00:00:00 2001
From: Koen Vervloesem <koen@vervloesem.eu>
Date: Thu, 15 Oct 2020 20:59:30 +0100
Subject: [PATCH] Support Bazel 3.6.0

---
 BAZEL_VERSION                 |  2 +-
 patches/bazel-3.6.0-arm.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 patches/bazel-3.6.0-arm.patch

diff --git a/BAZEL_VERSION b/BAZEL_VERSION
index d5c0c99..40c341b 100644
--- a/BAZEL_VERSION
+++ b/BAZEL_VERSION
@@ -1 +1 @@
-3.5.1
+3.6.0
diff --git a/patches/bazel-3.6.0-arm.patch b/patches/bazel-3.6.0-arm.patch
new file mode 100644
index 0000000..01df1c9
--- /dev/null
+++ b/patches/bazel-3.6.0-arm.patch
@@ -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"],
+     }),
+ )
+