revert changes in tools/cross-toolchain

tools/cross-toolchain/Dockerfile

@@ -31,10 +31,7 @@ RUN /tmp/install_clang_cross.sh
 
 # install osxcross
 ADD install_osxcross.sh /tmp/install_osxcross.sh
-ADD common_osxcross.sh /tmp/common_osxcross.sh
 RUN /tmp/install_osxcross.sh
-ADD link_osxcross.sh /tmp/link_osxcross.sh
-RUN /tmp/link_osxcross.sh
 
 # containerized development environment
 FROM build as devel

tools/cross-toolchain/configs/clang/bazel_4.2.1/cc/BUILD

@@ -24,16 +24,19 @@ licenses(["notice"])  # Apache 2.0
 
 cc_library(
     name = "malloc",
+    tags = ["manual"],
 )
 
 filegroup(
     name = "empty",
     srcs = [],
+    tags = ["manual"],
 )
 
 filegroup(
     name = "cc_wrapper",
     srcs = ["cc_wrapper.sh"],
+    tags = ["manual"],
 )
 
 filegroup(
@@ -42,6 +45,7 @@ filegroup(
         ["extra_tools/**"],
         allow_empty = True,
     ) + [":builtin_include_directory_paths"],
+    tags = ["manual"],
 )
 
 # This is the entry point for --crosstool_top.  Toolchains are found
@@ -49,6 +53,7 @@ filegroup(
 # the "${CPU}" entry in the toolchains attribute.
 cc_toolchain_suite(
     name = "toolchain",
+    tags = ["manual"],
     toolchains = {
         "k8|clang": ":cc-compiler-k8",
         "k8": ":cc-compiler-k8",
@@ -69,6 +74,7 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    tags = ["manual"],
     toolchain_config = ":local",
     toolchain_identifier = "local",
 )
@@ -125,6 +131,7 @@ cc_toolchain_config(
     ],
     opt_link_flags = ["-Wl,--gc-sections"],
     supports_start_end_lib = True,
+    tags = ["manual"],
     target_libc = "local",
     target_system_name = "local",
     tool_paths = {
@@ -162,8 +169,12 @@ cc_toolchain(
     objcopy_files = ":empty",
     strip_files = ":empty",
     supports_param_files = 1,
+    tags = ["manual"],
     toolchain_config = ":stub_armeabi-v7a",
     toolchain_identifier = "stub_armeabi-v7a",
 )
 
-armeabi_cc_toolchain_config(name = "stub_armeabi-v7a")
+armeabi_cc_toolchain_config(
+    name = "stub_armeabi-v7a",
+    tags = ["manual"],
+)

tools/cross-toolchain/configs/clang/bazel_4.2.1/config/BUILD

@@ -41,7 +41,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/prysmaticlabs/rbe-worker@sha256:ebf03ab43a88499e70c8bb4dad70b8bdbc9f9923a87bc72c39e9e7690fcd49f2",
+        "container-image": "docker://gcr.io/prysmaticlabs/rbe-worker@sha256:bd40e9a43b983c8b06079d14a0530100d6e1d59796616ca1d8b3902a197c97b1",
         "OSFamily": "Linux",
     },
 )

tools/cross-toolchain/configs/clang/bazel_4.2.1/java/BUILD

@@ -22,4 +22,5 @@ java_runtime(
     name = "jdk",
     srcs = [],
     java_home = "/usr/lib/jvm/java-8-openjdk-amd64",
+    tags = ["manual"],
 )

tools/cross-toolchain/configs/versions.bzl

@@ -4,8 +4,8 @@
 toolchain_config_spec0 = struct(config_repos = ["prysm_toolchains"], create_cc_configs = True, create_java_configs = True, env = {"BAZEL_COMPILER": "clang", "BAZEL_LINKLIBS": "-l%:libstdc++.a", "BAZEL_LINKOPTS": "-lm:-static-libgcc", "BAZEL_USE_LLVM_NATIVE_COVERAGE": "1", "GCOV": "llvm-profdata", "CC": "clang", "CXX": "clang++"}, java_home = "/usr/lib/jvm/java-8-openjdk-amd64", name = "clang")
 _TOOLCHAIN_CONFIG_SPECS = [toolchain_config_spec0]
 _BAZEL_TO_CONFIG_SPEC_NAMES = {"4.2.1": ["clang"]}
-LATEST = "sha256:ebf03ab43a88499e70c8bb4dad70b8bdbc9f9923a87bc72c39e9e7690fcd49f2"
-CONTAINER_TO_CONFIG_SPEC_NAMES = {"sha256:ebf03ab43a88499e70c8bb4dad70b8bdbc9f9923a87bc72c39e9e7690fcd49f2": ["clang"]}
+LATEST = "sha256:bd40e9a43b983c8b06079d14a0530100d6e1d59796616ca1d8b3902a197c97b1"
+CONTAINER_TO_CONFIG_SPEC_NAMES = {"sha256:bd40e9a43b983c8b06079d14a0530100d6e1d59796616ca1d8b3902a197c97b1": ["clang"]}
 _DEFAULT_TOOLCHAIN_CONFIG_SPEC = toolchain_config_spec0
 TOOLCHAIN_CONFIG_AUTOGEN_SPEC = struct(
         bazel_to_config_spec_names_map = _BAZEL_TO_CONFIG_SPEC_NAMES,

tools/cross-toolchain/install_osxcross.sh

@@ -1,6 +1,11 @@
 #!/bin/sh
-. "$(dirname "$0")"/common_osxcross.sh
 
+set -eu
+
+OSXCROSS_REPO=tpoechtrager/osxcross
+OSXCROSS_SHA1=2733413b6847c1489d6230f062d3293e6f42a021
+OSX_SDK=MacOSX10.15.sdk
+OSX_SDK_SUM=f1703b980d479b367d5bddd299fcad7e0ade2fe5019e571359f52ef2c58872a9
 
 # darwin
 mkdir -p /usr/x86_64-apple-darwin/osxcross
@@ -11,4 +16,16 @@ rm -f osxcross.tar.gz
 curl -sLo tarballs/${OSX_SDK}.tar.xz "https://prysmaticlabs.com/uploads/${OSX_SDK}.tar.xz"
 echo "${OSX_SDK_SUM}"  "tarballs/${OSX_SDK}.tar.xz" | sha256sum -c -
 yes "" | SDK_VERSION=10.15 OSX_VERSION_MIN=10.12 OCDEBUG=1 ./build.sh
-
+mv target/* /usr/x86_64-apple-darwin/osxcross/
+mv tools /usr/x86_64-apple-darwin/osxcross/
+cd /usr/x86_64-apple-darwin/osxcross/include
+ln -s ../SDK/${OSX_SDK}/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/ CarbonCore
+ln -s ../SDK/${OSX_SDK}/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/ CoreFoundation
+ln -s ../SDK/${OSX_SDK}/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/ Frameworks
+ln -s ../SDK/${OSX_SDK}/System/Library/Frameworks/Security.framework/Versions/A/Headers/ Security
+rm -rf /tmp/osxcross
+rm -rf "/usr/x86_64-apple-darwin/osxcross/SDK/${OSX_SDK}/usr/share/man"
+# symlink ld64.lld
+ln -s /usr/x86_64-apple-darwin/osxcross/bin/x86_64-apple-darwin19-ld /usr/x86_64-apple-darwin/osxcross/bin/ld64.lld
+ln -s /usr/x86_64-apple-darwin/osxcross/lib/libxar.so.1 /usr/lib
+ln -s /usr/x86_64-apple-darwin/osxcross/lib/libtapi.so* /usr/lib

tools/cross-toolchain/rbe_toolchains_config.bzl

@@ -3,7 +3,7 @@ load("@prysm//tools/cross-toolchain:configs/versions.bzl", _generated_toolchain_
 
 _PRYSM_BUILD_IMAGE_REGISTRY = "gcr.io"
 _PRYSM_BUILD_IMAGE_REPOSITORY = "prysmaticlabs/rbe-worker"
-_PRYSM_BUILD_IMAGE_DIGEST = "sha256:ebf03ab43a88499e70c8bb4dad70b8bdbc9f9923a87bc72c39e9e7690fcd49f2"
+_PRYSM_BUILD_IMAGE_DIGEST = "sha256:bd40e9a43b983c8b06079d14a0530100d6e1d59796616ca1d8b3902a197c97b1"
 _PRYSM_BUILD_IMAGE_JAVA_HOME = "/usr/lib/jvm/java-8-openjdk-amd64"
 _CONFIGS_OUTPUT_BASE = "tools/cross-toolchain/configs"