working osx toolchain

Author: SuburbanDad

.bazelrc

@@ -33,11 +33,15 @@ run --define kafka_enabled=false
 
 # use multi-arch toolchain
 build:cross --crosstool_top=//tools/cross-toolchain:multiarch_toolchain
+build:cross --host_platform=@io_bazel_rules_go//go/toolchain:linux_amd64
+build:cross --host_crosstool_top=//tools/cross-toolchain:hostonly_toolchain
+#build:cross --distinct_host_configuration=true
 
 # toolchain build debug config
 build:debug --sandbox_debug
 build:debug --toolchain_resolution_debug
 build:debug --verbose_failures
+build:debug -s
 
 # Docker Sandbox Mode - Note all docker sandbox configs must run from a linux x86_64 host
 build:docker-sandbox --experimental_docker_image=suburbandad/cross-clang-10:latest

tools/cross-toolchain/BUILD

@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
-load(":cc_toolchain_config_linux_arm64.bzl", "arm64_cc_toolchain_config")
 load(":cc_toolchain_config_osx.bzl", "osx_cc_toolchain_config")
+load(":cc_toolchain_config_linux_arm64.bzl", "arm64_cc_toolchain_config")
 
 cc_toolchain_suite(
     name = "multiarch_toolchain",
@@ -14,6 +14,13 @@ cc_toolchain_suite(
     },
 )
 
+cc_toolchain_suite(
+    name = "hostonly_toolchain",
+    toolchains = {
+        "k8": "cc-clang-amd64",
+    },
+)
+
 filegroup(
     name = "empty",
     srcs = [],

tools/cross-toolchain/cc_toolchain_config_osx.bzl

@@ -20,7 +20,7 @@ load(
 
 def _impl(ctx):
     toolchain_identifier = "osxcross"
-    compiler = "gcc"
+    compiler = "clang"
     abi_version = "darwin_x86_64"
     abi_libc_version = "darwin_x86_64"
     install = "/usr/x86_64-apple-darwin/"
@@ -31,12 +31,12 @@ def _impl(ctx):
     osxcross_binprefix = osxcross + "bin/x86_64-apple-darwin14-"
     sdkroot = osxcross + "SDK/MacOSX10.10.sdk/"
     cross_system_include_dirs = [
-        #"/usr/lib/clang/10.0.0/include",
+        "/usr/lib/clang/10.0.0/include",
         osxcross + "include",
         sdkroot + "usr/include",
-        sdkroot + "usr/include/c++/v1/",
     ]
     cross_system_lib_dirs = [
+        "/usr/x86_64-apple-darwin/lib",
         sdkroot + "usr/lib",
         osxcross + "/lib",
     ]
@@ -57,7 +57,7 @@ def _impl(ctx):
                 flag_groups = [
                     flag_group(
                         flags = [
-                            "-isysroot " + sdkroot,
+                            "-stdlib=libc++",
                             "-no-canonical-prefixes",
                             "-Wno-builtin-macro-redefined",
                             "-D__DATE__=\"redacted\"",
@@ -85,6 +85,7 @@ def _impl(ctx):
                     flag_group(
                         flags = [
                             "-mlinker-version=400",
+                            "-B " + osxcross + "bin",
                             "-nostdinc",
                             "-U_FORTIFY_SOURCE",
                             "-fstack-protector",
@@ -134,7 +135,6 @@ def _impl(ctx):
                 flag_groups = [
                     flag_group(
                         flags = [
-                            #"-target x86_64-apple-darwin-macho",
                             "-v",
                             "-lm",
                             "-no-canonical-prefixes",
@@ -180,22 +180,6 @@ def _impl(ctx):
         ],
     )
 
-    sysroot_feature = feature(
-        name = "sysroot",
-        enabled = True,
-        flag_sets = [
-            flag_set(
-                actions = ALL_COMPILE_ACTIONS + ALL_LINK_ACTIONS,
-                flag_groups = [
-                    flag_group(
-                        expand_if_available = "sysroot",
-                        flags = ["--sysroot=%{sysroot}"],
-                    ),
-                ],
-            ),
-        ],
-    )
-
     coverage_feature = feature(
         name = "coverage",
         flag_sets = [
@@ -227,7 +211,6 @@ def _impl(ctx):
         default_compile_flags_feature,
         objcopy_embed_flags_feature,
         user_compile_flags_feature,
-        #sysroot_feature,
         coverage_feature,
     ]
 
@@ -237,7 +220,6 @@ def _impl(ctx):
         tool_path(name = "dwp", path = "/usr/bin/dwp"),
         tool_path(name = "gcov", path = "/usr/bin/gcov"),
         tool_path(name = "nm", path = osxcross_binprefix + "nm"),
-        #tool_path(name = "objcopy", path = "/usr/bin/objcopy"),
         tool_path(name = "objdump", path = osxcross_binprefix + "ObjectDump"),
         tool_path(name = "strip", path = osxcross_binprefix + "strip"),
         tool_path(name = "gcc", path = osxcross + "bin/o64-clang"),
@@ -249,7 +231,6 @@ def _impl(ctx):
         features = features,
         abi_version = abi_version,
         abi_libc_version = abi_libc_version,
-        #builtin_sysroot = sysroot,
         compiler = compiler,
         cxx_builtin_include_directories = cross_system_include_dirs,
         host_system_name = "x86_64-unknown-linux-gnu",
@@ -267,4 +248,4 @@ osx_cc_toolchain_config = rule(
         "stdlib": attr.string(),
     },
     provides = [CcToolchainConfigInfo],
-)
+)

tools/cross-toolchain/cc_toolchain_config_windows.bzl

@@ -2,6 +2,10 @@
 
 set -eu
 
+OSXCROSS_REPO=tpoechtrager/osxcross
+OSXCROSS_SHA1=bee9df6
+DARWIN_SDK_URL=https://www.dropbox.com/s/yfbesd249w10lpc/MacOSX10.10.sdk.tar.xz
+
 curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-${INSTALL_LLVM_VERSION}/clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-linux-gnu-ubuntu-18.04.tar.xz \
     -o clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-linux-gnu-ubuntu-18.04.tar.xz
 tar xf clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-linux-gnu-ubuntu-18.04.tar.xz --strip-components=1 -C /usr
@@ -23,18 +27,23 @@ mv /clang+llvm-${INSTALL_LLVM_VERSION}-aarch64-linux-gnu/lib/clang/10.0.0/lib/li
 rm -rf /clang+llvm-${INSTALL_LLVM_VERSION}-aarch64-linux-gnu
 
 # darwin
-curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-${INSTALL_LLVM_VERSION}/clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin.tar.xz \
-    -o clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin.tar.xz
-tar xf clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin.tar.xz
-rm -f clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin.tar.xz
-mkdir -p /usr/x86_64-apple-darwin/lib/clang/10.0.0
-mkdir -p /usr/x86_64-apple-darwin/include/c++
-mkdir -p /usr/lib/clang/10.0.0/lib/darwin/
-mv /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin/include/c++/v1 /usr/x86_64-apple-darwin/include/c++/
-mv /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin/lib/clang/10.0.0/include /usr/x86_64-apple-darwin/lib/clang/10.0.0/
-mv /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin/lib/libc++.a /usr/x86_64-apple-darwin/lib/
-mv /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin/lib/libc++abi.a /usr/x86_64-apple-darwin/lib/
-mv /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin/lib/libunwind.a /usr/x86_64-apple-darwin/lib/
-mv /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin/lib/clang/10.0.0/lib/darwin/libclang_rt.osx.a /usr/lib/clang/10.0.0/lib/darwin/
-mv /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin/lib/clang/10.0.0/lib/darwin/libclang_rt.cc_kext.a /usr/lib/clang/10.0.0/lib/darwin/
-rm -rf /clang+llvm-${INSTALL_LLVM_VERSION}-x86_64-apple-darwin
+mkdir -p /usr/x86_64-apple-darwin/
+mkdir -p /tmp/osxcross && cd "/tmp/osxcross"
+curl -sLo osxcross.tar.gz "https://codeload.github.com/${OSXCROSS_REPO}/tar.gz/${OSXCROSS_SHA1}"
+tar --strip=1 -xzf osxcross.tar.gz
+rm -f osxcross.tar.gz
+curl -sLo tarballs/MacOSX10.10.sdk.tar.xz "${DARWIN_SDK_URL}"
+yes "" | SDK_VERSION=10.10 OSX_VERSION_MIN=10.10 ./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/MacOSX10.10.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/ CarbonCore
+ln -s ../SDK/MacOSX10.10.sdk/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/ CoreFoundation
+ln -s ../SDK/MacOSX10.10.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/ Frameworks
+ln -s ../SDK/MacOSX10.10.sdk/System/Library/Frameworks/Security.framework/Versions/A/Headers/ Security
+rm -rf /tmp/osxcross
+rm -rf "/usr/x86_64-apple-darwin/osxcross/SDK/MacOSX10.10.sdk/usr/share/man"
+# symlink ld64.lld
+ln -s /usr/x86_64-apple-darwin/osxcross/bin/x86_64-apple-darwin14-ld /usr/x86_64-apple-darwin/osxcross/bin/ld64.lld
+#final hack due to linker oddity
+ln -s /usr/x86_64-apple-darwin/osxcross/lib/libxar.so.1 /usr/lib