update cross-compile cc toolchain to latest

Author: emacski

.bazelrc

@@ -12,26 +12,30 @@ build --copt=-O3
 build:release --copt=-w
 build:release --output_filter=DONT_MATCH_ANYTHING
 
+# build with shared gnu libstdc++ instead of static libc++
+build:gnulibcpp --@com_github_emacski_bazeltools//toolchain/cpp/clang:use_libcpp="libstdc++"
+build:gnulibcpp --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0
+
 # protobuf / grpc build options
 build --define=use_fast_cpp_protos=true
 build --define=allow_oversize_protos=true
 build --define=grpc_no_ares=true
 
 # platform config groups
 
-build:linux_amd64 --platforms=@com_github_emacski_bazeltools//platform:linux_amd64
+build:linux_amd64 --platforms=@com_github_emacski_bazeltools//toolchain:linux_amd64
 # boringssl requires legacy toolchain resolution
-build:linux_amd64 --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
+build:linux_amd64 --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
 build:linux_amd64 --cpu=k8
 
-build:linux_arm64 --platforms=@com_github_emacski_bazeltools//platform:linux_arm64
+build:linux_arm64 --platforms=@com_github_emacski_bazeltools//toolchain:linux_arm64
 # boringssl requires legacy toolchain resolution
-build:linux_arm64 --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
+build:linux_arm64 --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
 build:linux_arm64 --cpu=aarch64
 
-build:linux_arm --platforms=@com_github_emacski_bazeltools//platform:linux_arm
+build:linux_arm --platforms=@com_github_emacski_bazeltools//toolchain:linux_arm
 # boringssl requires legacy toolchain resolution
-build:linux_arm --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
-build:linux_arm --cpu=arm
+build:linux_arm --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
+build:linux_arm --cpu=armhf
 
 try-import %workspace%/.bazelrc.user

WORKSPACE

@@ -18,12 +18,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "com_github_emacski_bazeltools",
-    sha256 = "ef868ef493a8fc9609a32093a90b57f320646fa5af3b3eb49bb7380f5e0580c6",
-    strip_prefix = "bazel-tools-9cbf59fc288489ab3c7e42ed124507e1b1adba3a",
-    urls = ["https://github.com/emacski/bazel-tools/archive/9cbf59fc288489ab3c7e42ed124507e1b1adba3a.tar.gz"],
+    sha256 = "dba9e8f0613401ed3c052d6fe79b3517197a7747046659845309fb17e9b3038d",
+    strip_prefix = "bazel-tools-17a0d8b9ae66bc542853a72365ef1aeb85086827",
+    urls = ["https://github.com/emacski/bazel-tools/archive/17a0d8b9ae66bc542853a72365ef1aeb85086827.tar.gz"],
 )
 
-register_toolchains("@com_github_emacski_bazeltools//toolchain/cpp/clang:all")
+load(
+    "@com_github_emacski_bazeltools//toolchain/cpp/clang:defs.bzl",
+    "register_clang_cross_toolchains",
+)
+
+register_clang_cross_toolchains(clang_version = "11")
 
 # python client deps
 
@@ -94,14 +99,29 @@ go_repository(
 
 # protobuf / grpc deps
 
+http_archive(
+    name = "com_google_protobuf",
+    sha256 = "0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441",
+    strip_prefix = "protobuf-3.15.8",
+    urls = [
+        "https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz",
+    ],
+)
+
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 http_archive(
     name = "com_github_grpc_grpc",
     patches = [
-        "@com_github_emacski_tensorflowservingarmclient//third_party/grpc:cython_library.patch",
+        "@//third_party/grpc:cython_library.patch",
     ],
     sha256 = "bb6de0544adddd54662ba1c314eff974e84c955c39204a4a2b733ccd990354b7",
     strip_prefix = "grpc-1.36.3",
-    urls = ["https://github.com/grpc/grpc/archive/v1.36.3.tar.gz"],
+    urls = [
+        "https://github.com/grpc/grpc/archive/v1.36.3.tar.gz"
+    ],
 )
 
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")

cc/README.md

@@ -9,13 +9,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "com_github_emacski_bazeltools",
-    sha256 = "ef868ef493a8fc9609a32093a90b57f320646fa5af3b3eb49bb7380f5e0580c6",
-    strip_prefix = "bazel-tools-9cbf59fc288489ab3c7e42ed124507e1b1adba3a",
-    urls = ["https://github.com/emacski/bazel-tools/archive/9cbf59fc288489ab3c7e42ed124507e1b1adba3a.tar.gz"],
+    sha256 = "dba9e8f0613401ed3c052d6fe79b3517197a7747046659845309fb17e9b3038d",
+    strip_prefix = "bazel-tools-17a0d8b9ae66bc542853a72365ef1aeb85086827",
+    urls = ["https://github.com/emacski/bazel-tools/archive/17a0d8b9ae66bc542853a72365ef1aeb85086827.tar.gz"],
 )
 
+load(
+    "@com_github_emacski_bazeltools//toolchain/cpp/clang:defs.bzl",
+    "register_clang_cross_toolchains",
+)
 # OPTIONAL: only required if using the cross-build cc toolchain
-register_toolchains("@com_github_emacski_bazeltools//toolchain/cpp/clang:all")
+register_clang_cross_toolchains(clang_version = "11")
 
 http_archive(
     name = "com_github_emacski_tensorflowservingarmclient",
@@ -54,19 +58,16 @@ Optional Bazel Build Options
 
 # amd64 (x86_64)
 --platforms=@com_github_emacski_bazeltools//platform:linux_amd64
-# some deps still require legacy toolchain resolution
---crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
---cpu=k8
 
 # arm64 (aarch64)
 --platforms=@com_github_emacski_bazeltools//platform:linux_arm64
-# some deps still require legacy toolchain resolution
---crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
+# some deps may still require legacy toolchain resolution
+--crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
 --cpu=aarch64
 
 # arm (armhf)
 --platforms=@com_github_emacski_bazeltools//platform:linux_arm
 # some deps still require legacy toolchain resolution
---crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
---cpu=arm
+--crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
+--cpu=armhf
 ```

go/README.md

@@ -9,13 +9,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "com_github_emacski_bazeltools",
-    sha256 = "ef868ef493a8fc9609a32093a90b57f320646fa5af3b3eb49bb7380f5e0580c6",
-    strip_prefix = "bazel-tools-9cbf59fc288489ab3c7e42ed124507e1b1adba3a",
-    urls = ["https://github.com/emacski/bazel-tools/archive/9cbf59fc288489ab3c7e42ed124507e1b1adba3a.tar.gz"],
+    sha256 = "dba9e8f0613401ed3c052d6fe79b3517197a7747046659845309fb17e9b3038d",
+    strip_prefix = "bazel-tools-17a0d8b9ae66bc542853a72365ef1aeb85086827",
+    urls = ["https://github.com/emacski/bazel-tools/archive/17a0d8b9ae66bc542853a72365ef1aeb85086827.tar.gz"],
 )
 
+load(
+    "@com_github_emacski_bazeltools//toolchain/cpp/clang:defs.bzl",
+    "register_clang_cross_toolchains",
+)
 # OPTIONAL: only required if using the cross-build cc toolchain
-register_toolchains("@com_github_emacski_bazeltools//toolchain/cpp/clang:all")
+register_clang_cross_toolchains(clang_version = "11")
 
 http_archive(
     name = "io_bazel_rules_go",

py/README.md

@@ -9,13 +9,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "com_github_emacski_bazeltools",
-    sha256 = "ef868ef493a8fc9609a32093a90b57f320646fa5af3b3eb49bb7380f5e0580c6",
-    strip_prefix = "bazel-tools-9cbf59fc288489ab3c7e42ed124507e1b1adba3a",
-    urls = ["https://github.com/emacski/bazel-tools/archive/9cbf59fc288489ab3c7e42ed124507e1b1adba3a.tar.gz"],
+    sha256 = "dba9e8f0613401ed3c052d6fe79b3517197a7747046659845309fb17e9b3038d",
+    strip_prefix = "bazel-tools-17a0d8b9ae66bc542853a72365ef1aeb85086827",
+    urls = ["https://github.com/emacski/bazel-tools/archive/17a0d8b9ae66bc542853a72365ef1aeb85086827.tar.gz"],
 )
 
+load(
+    "@com_github_emacski_bazeltools//toolchain/cpp/clang:defs.bzl",
+    "register_clang_cross_toolchains",
+)
 # OPTIONAL: only required if using the cross-build cc toolchain
-register_toolchains("@com_github_emacski_bazeltools//toolchain/cpp/clang:all")
+register_clang_cross_toolchains(clang_version = "11")
 
 http_archive(
     name = "rules_python",
@@ -64,19 +68,16 @@ Optional Bazel Build Options
 
 # amd64 (x86_64)
 --platforms=@com_github_emacski_bazeltools//platform:linux_amd64
-# some deps still require legacy toolchain resolution
---crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
---cpu=k8
 
 # arm64 (aarch64)
 --platforms=@com_github_emacski_bazeltools//platform:linux_arm64
-# some deps still require legacy toolchain resolution
---crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
+# some deps may still require legacy toolchain resolution
+--crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
 --cpu=aarch64
 
 # arm (armhf)
 --platforms=@com_github_emacski_bazeltools//platform:linux_arm
 # some deps still require legacy toolchain resolution
---crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
---cpu=arm
+--crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:clang11_crosstool
+--cpu=armhf
 ```

tools/docker/Dockerfile

@@ -14,16 +14,16 @@
 FROM debian:buster
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
+        curl ca-certificates \
         gcc g++ \
         gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
-        gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
-        libtinfo5 \
-        curl xz-utils ca-certificates && \
+        gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
-ENV INSTALL_LLVM_VERSION=10.0.0
-RUN curl https://raw.githubusercontent.com/emacski/bazel-tools/master/toolchain/cpp/clang/install_clang_cross.sh -o install_clang_cross.sh && \
-    sh install_clang_cross.sh && rm -f install_clang_cross.sh
+# clang cross-compile toolchain
+RUN curl -L https://raw.githubusercontent.com/emacski/bazel-tools/master/toolchain/cpp/clang/install_clang11_debian10.sh \
+        -o install_clang11_debian10.sh && \
+    sh install_clang11_debian10.sh && rm -f install_clang11_debian10.sh
 # python toolchain
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -43,11 +43,7 @@ RUN dpkg --add-architecture arm64 && \
         libpython3.7-dev:arm64 \
         libpython3.7-dev:armhf && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    mkdir /usr/aarch64-linux-gnu/include/aarch64-linux-gnu && \
-    mkdir /usr/arm-linux-gnueabihf/include/arm-linux-gnueabihf && \
-    mv /usr/include/aarch64-linux-gnu/python3.7m /usr/aarch64-linux-gnu/include/aarch64-linux-gnu/ && \
-    mv /usr/include/arm-linux-gnueabihf/python3.7m /usr/arm-linux-gnueabihf/include/arm-linux-gnueabihf/
+    rm -rf /var/lib/apt/lists/*
 # install bazel
 RUN apt-get update && \
     apt-get install -y \