just messing around

swift-nav · Dec 5, 2024 · ccdc20b · ccdc20b
1 parent 3e5d190
commit ccdc20b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 28 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -0,0 +1 @@
+workspace(name = "rules_swiftnav")
diff --git a/cc/repositories.bzl b/cc/repositories.bzl
@@ -162,15 +162,15 @@ def register_x86_64_linux_musl_toolchain():
 
 def llvm_mingw_toolchain():
     http_archive(
-        name = "x86_64-linux-llvm-mingw",
+        name = "llvm_mingw_toolchain",
         build_file = "@rules_swiftnav//cc/toolchains/llvm_x86_64_windows:toolchain.BUILD",
         sha256 = "21458febf5d2c918df922dd0da60137a8787e5e6b427925a1977c882fc79b550",
         strip_prefix = "llvm-mingw-20241203-ucrt-ubuntu-20.04-x86_64",
         url = X86_64_LINUX_UCRT_LLVM_MINGW,
     )
 
 def register_llvm_mingw_toolchain():
-    native.register_toolchains("@rules_swiftnav//cc/toolchains/llvm_x86_64_windows:cc-toolchain-x86_64-windows")
+    native.register_toolchains("@rules_swiftnav//cc/toolchains/llvm_x86_64_windows:mingw_toolchain")
 
 def gcc_arm_embedded_toolchain():
     http_archive(

diff --git a/cc/toolchains/llvm/unix_cc_toolchain_config.bzl b/cc/toolchains/llvm/unix_cc_toolchain_config.bzl
@@ -1346,7 +1346,7 @@ def _impl(ctx):
                 flag_groups = ([
                     flag_group(
                         flags = [
-                            "-stdlib=libstdc++",
+                            "",
                         ],
                     ),
                 ]),

diff --git a/cc/toolchains/llvm_x86_64_windows/BUILD.bazel b/cc/toolchains/llvm_x86_64_windows/BUILD.bazel
@@ -12,6 +12,12 @@ package(default_visibility = ["//visibility:public"])
 
 load("//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
 
+constraint_value(
+    name = "llvm_mingw_toolchain",
+    constraint_setting = "@rules_swiftnav//cc/constraints:toolchain",
+    visibility = ["//visibility:public"],
+)
+
 filegroup(
     name = "wrappers",
     srcs = glob([
@@ -24,59 +30,62 @@ filegroup(
     name = "ar_files",
     srcs = [
         ":wrappers",
-        "@x86_64-linux-llvm-mingw//:ar",
+        "@llvm_mingw_toolchain//:ar",
+        "@llvm_mingw_toolchain//:include",
     ],
 )
 
 filegroup(
     name = "as_files",
     srcs = [
         ":wrappers",
-        "@x86_64-linux-llvm-mingw//:as",
+        "@llvm_mingw_toolchain//:as",
+        "@llvm_mingw_toolchain//:include",
     ],
 )
 
 filegroup(
     name = "compiler_files",
     srcs = [
         ":wrappers",
-        "@x86_64-linux-llvm-mingw//:bin",
-        "@x86_64-linux-llvm-mingw//:include",
+        "@llvm_mingw_toolchain//:bin",
+        "@llvm_mingw_toolchain//:include",
     ],
 )
 
 filegroup(
     name = "dwp_files",
     srcs = [
         ":wrappers",
-        "@x86_64-linux-llvm-mingw//:dwp",
+        "@llvm_mingw_toolchain//:dwp",
     ],
 )
 
 filegroup(
     name = "linker_files",
     srcs = [
         ":wrappers",
-        "@x86_64-linux-llvm-mingw//:ar",
-        "@x86_64-linux-llvm-mingw//:clang",
-        "@x86_64-linux-llvm-mingw//:ld",
-        "@x86_64-linux-llvm-mingw//:lib",
+        "@llvm_mingw_toolchain//:ar",
+        "@llvm_mingw_toolchain//:clang",
+        "@llvm_mingw_toolchain//:include",
+        "@llvm_mingw_toolchain//:ld",
+        "@llvm_mingw_toolchain//:lib",
     ],
 )
 
 filegroup(
     name = "objcopy_files",
     srcs = [
         ":wrappers",
-        "@x86_64-linux-llvm-mingw//:objcopy",
+        "@llvm_mingw_toolchain//:objcopy",
     ],
 )
 
 filegroup(
     name = "strip_files",
     srcs = [
         ":wrappers",
-        "@x86_64-linux-llvm-mingw//:strip",
+        "@llvm_mingw_toolchain//:strip",
     ],
 )
 
@@ -85,20 +94,20 @@ filegroup(
     srcs = [
         ":compiler_files",
         ":linker_files",
-        "@x86_64-linux-llvm-mingw//:bin",
+        "@llvm_mingw_toolchain//:bin",
     ],
 )
 
 cc_toolchain_config(
-    name = "local-x86_64-windows",
-    abi_libc_version = "glibc_unknown",
+    name = "mingw_toolchain_config",
+    abi_libc_version = "mingw",
     abi_version = "clang",
     compiler = "clang",
     cxx_builtin_include_directories = [
-        "@x86_64-linux-llvm-mingw//:include",
+        "@llvm_mingw_toolchain//:include",
     ],
     host_system_name = "x86_64-linux-gnu",
-    target_cpu = "k8",
+    target_cpu = "x86_64",
     target_libc = "glibc_unknown",
     target_system_name = "x86_64-windows",
     tool_paths = {
@@ -114,8 +123,8 @@ cc_toolchain_config(
         "objdump": "wrappers/llvm-objdump",
         "strip": "wrappers/llvm-strip",
     },
-    toolchain_identifier = "clang-x86_64-linux",
-    toolchain_path_prefix = "external/x86_64-linux-llvm-mingw",
+    toolchain_identifier = "toolchain",
+    toolchain_path_prefix = "external/llvm_mingw_toolchain",
 )
 
 cc_toolchain(
@@ -124,18 +133,18 @@ cc_toolchain(
     ar_files = ":ar_files",
     as_files = ":as_files",
     compiler_files = ":compiler_files",
-    dwp_files = ":dwp_files",
+    dwp_files = ":empty",
     linker_files = ":linker_files",
     objcopy_files = ":objcopy_files",
     strip_files = ":strip_files",
-    toolchain_config = ":local-x86_64-windows",
+    toolchain_config = ":mingw_toolchain_config",
 )
 
 toolchain(
-    name = "cc-toolchain-x86_64-windows",
+    name = "mingw_toolchain",
     exec_compatible_with = [
         "@platforms//cpu:x86_64",
-        "@platforms//os:windows",
+        "@platforms//os:linux",
     ],
     target_compatible_with = [
         "@platforms//cpu:x86_64",

diff --git a/cc/toolchains/llvm_x86_64_windows/config.bzl b/cc/toolchains/llvm_x86_64_windows/config.bzl
@@ -80,7 +80,7 @@ def _impl(ctx):
                     flag_groups = ([
                         flag_group(
                             flags = [
-                                "--sysroot=external/x86_64-linux-llvm-mingw",
+                                "--sysroot=external/llvm_mingw_toolchain",
                                 "-no-canonical-prefixes",
                                 # Reproducibility
                                 "-Wno-builtin-macro-redefined",

diff --git a/cc/toolchains/llvm_x86_64_windows/toolchain.BUILD b/cc/toolchains/llvm_x86_64_windows/toolchain.BUILD
@@ -30,6 +30,7 @@ filegroup(
     srcs = glob([
         "x86_64-w64-mingw32/include/**",
         "lib/clang/*/include/**",
+        "generic-w64-mingw32/include/c++/v1/*",
     ]),
 )
 

diff --git a/cc/toolchains/llvm_x86_64_windows/wrappers/wrapper b/cc/toolchains/llvm_x86_64_windows/wrappers/wrapper
@@ -34,7 +34,7 @@ if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
 fi
 
 tool_name=$(basename "${BASH_SOURCE[0]}")
-toolchain_bindir=external/x86_64-linux-llvm-mingw/bin
+toolchain_bindir=external/llvm_mingw_toolchain/bin
 
 if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
   # We're running under _execroot_, call the real tool.

diff --git a/platforms/BUILD.bazel b/platforms/BUILD.bazel
@@ -125,7 +125,6 @@ platform(
     constraint_values = [
         "@platforms//os:windows",
         "@platforms//cpu:x86_64",
-        "@rules_swiftnav//cc/toolchains/llvm_x86_64_windows:cc-toolchain-x86_64-windows
     ],
     visibility = ["//visibility:public"],
 )