Merge pull request #66 from dtolnay/compat

Set more precise compatibility for all C++ libraries

Author: dtolnay

BUCK

@@ -131,25 +131,35 @@ def rust_bootstrap_buildscript_run(**kwargs):
 
 def cxx_bootstrap_library(
         name,
-        compatible_with = None,
         deps = [],
+        target_compatible_with = [],
         visibility = None,
         **kwargs):
     extra_deps = ["toolchains//cxx:stdlib"]
 
+    target_compatible_with = [
+        select({
+            "DEFAULT": "prelude//:none",
+        } | {
+            constraint: constraint
+            for constraint in disjunction.split(" || ")
+        })
+        for disjunction in target_compatible_with
+    ]
+
     native.cxx_library(
         name = "{}-compile".format(name),
-        compatible_with = compatible_with,
         deps = deps + extra_deps,
         preferred_linkage = "static",
+        target_compatible_with = target_compatible_with,
         **kwargs
     )
 
     transition_alias(
         name = name,
         actual = ":{}-compile".format(name),
-        compatible_with = compatible_with,
         incoming_transition = "toolchains//cxx:prune_cxx_configuration",
+        target_compatible_with = target_compatible_with,
         visibility = visibility,
     )
 

defs.bzl

@@ -16,9 +16,9 @@ srcs = [
 ]
 compiler_flags = ["-mavx512f", "-mavx512vl"]
 headers = ["c/*.h"]
-compatible_with = [
-    "prelude//os/constraints:linux",
-    "prelude//os/constraints:macos",
+target_compatible_with = [
+    "prelude//cpu/constraints:x86_64",
+    "prelude//os/constraints:linux || prelude//os/constraints:macos",
 ]
 
 [['cfg(all(target_arch = "x86_64", target_os = "windows", target_env = "gnu"))'.cxx_library]]
@@ -34,7 +34,10 @@ srcs = [
 ]
 compiler_flags = ["-mavx512f", "-mavx512vl"]
 headers = ["c/*.h"]
-compatible_with = ["prelude//os/constraints:windows"]
+target_compatible_with = [
+    "prelude//cpu/constraints:x86_64",
+    "prelude//os/constraints:windows",
+]
 
 [['cfg(all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"))'.cxx_library]]
 name = "simd_x86_windows_msvc"
@@ -48,7 +51,10 @@ srcs = [
     "c/blake3_avx512_x86-64_windows_msvc.asm",
 ]
 headers = ["c/*.h"]
-compatible_with = ["prelude//os/constraints:windows"]
+target_compatible_with = [
+    "prelude//cpu/constraints:x86_64",
+    "prelude//os/constraints:windows",
+]
 
 ['cfg(any(target_arch = "aarch64", target_arch = "arm"))']
 cfgs = ["blake3_neon"]
@@ -57,3 +63,6 @@ cfgs = ["blake3_neon"]
 name = "simd_neon-aarch64"
 srcs = ["c/blake3_neon.c"]
 headers = ["c/*.h"]
+target_compatible_with = [
+    "prelude//cpu/constraints:arm64",
+]

fixups/blake3/fixups.toml

@@ -7,6 +7,10 @@ name = "psm_s-linux-x86_64"
 srcs = ["src/arch/x86_64.s"]
 compiler_flags = ["-xassembler-with-cpp"]
 headers = ["src/arch/psm.h"]
+target_compatible_with = [
+    "prelude//cpu/constraints:x86_64",
+    "prelude//os/constraints:linux",
+]
 
 ['cfg(all(target_arch = "aarch64", target_os = "linux"))']
 cfgs = ["asm", "switchable_stack"]
@@ -15,6 +19,10 @@ name = "psm_s-linux-aarch64"
 srcs = ["src/arch/aarch_aapcs64.s"]
 compiler_flags = ["-xassembler-with-cpp"]
 headers = ["src/arch/psm.h"]
+target_compatible_with = [
+    "prelude//cpu/constraints:arm64",
+    "prelude//os/constraints:linux",
+]
 
 ['cfg(all(target_arch = "x86_64", target_os = "macos"))']
 cfgs = ["asm", "switchable_stack"]
@@ -24,6 +32,10 @@ srcs = ["src/arch/x86_64.s"]
 compiler_flags = ["-xassembler-with-cpp"]
 preprocessor_flags = ["-DCFG_TARGET_OS_macos"]
 headers = ["src/arch/psm.h"]
+target_compatible_with = [
+    "prelude//cpu/constraints:x86_64",
+    "prelude//os/constraints:macos",
+]
 
 ['cfg(all(target_arch = "aarch64", target_os = "macos"))']
 cfgs = ["asm", "switchable_stack"]
@@ -33,13 +45,21 @@ srcs = ["src/arch/aarch_aapcs64.s"]
 compiler_flags = ["-xassembler-with-cpp"]
 preprocessor_flags = ["-DCFG_TARGET_OS_macos"]
 headers = ["src/arch/psm.h"]
+target_compatible_with = [
+    "prelude//cpu/constraints:arm64",
+    "prelude//os/constraints:macos",
+]
 
 ['cfg(all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"))']
 cfgs = ["asm"]
 [['cfg(all(target_arch = "x86_64", target_os = "windows", target_env = "msvc"))'.cxx_library]]
 name = "psm_s-windows-x86_64-msvc"
 srcs = ["src/arch/x86_64_msvc.asm"]
 headers = ["src/arch/psm.h"]
+target_compatible_with = [
+    "prelude//cpu/constraints:x86_64",
+    "prelude//os/constraints:windows",
+]
 
 ['cfg(all(target_arch = "x86_64", target_os = "windows", target_env = "gnu"))']
 cfgs = ["asm"]
@@ -48,3 +68,7 @@ name = "psm_s-windows-x86_64-gnu"
 srcs = ["src/arch/x86_64_windows_gnu.s"]
 compiler_flags = ["-xassembler-with-cpp"]
 headers = ["src/arch/psm.h"]
+target_compatible_with = [
+    "prelude//cpu/constraints:x86_64",
+    "prelude//os/constraints:windows",
+]

fixups/psm/fixups.toml

@@ -4,3 +4,4 @@ buildscript.run = false
 name = "windows"
 srcs = ["src/arch/windows.c"]
 compiler_flags = ["-DWINDOWS"]
+target_compatible_with = ["prelude//os/constraints:windows"]

fixups/stacker/fixups.toml

@@ -3,3 +3,4 @@ buildscript.run = false
 [['cfg(target_os = "windows")'.prebuilt_cxx_library]]
 name = "extra_libraries"
 static_libs = ["lib/libwinapi_ole32.a", "lib/libwinapi_shell32.a"]
+target_compatible_with = ["prelude//os/constraints:windows"]