diff --git a/cc/defs.bzl b/cc/defs.bzl index 7a4e854..9f109ca 100644 --- a/cc/defs.bzl +++ b/cc/defs.bzl @@ -11,9 +11,9 @@ """Swift wrappers for native cc rules.""" load("//stamp:stamp_file.bzl", "stamp_file") -load(":utils.bzl", "construct_local_include") -load(":copts.bzl", "DEFAULT_COPTS", "GCC5_COPTS", "GCC6_COPTS") load(":cc_static_library.bzl", _cc_static_library = "cc_static_library") +load(":copts.bzl", "DEFAULT_COPTS", "GCC5_COPTS", "GCC6_COPTS") +load(":utils.bzl", "construct_local_include") # Name for a unit test UNIT = "unit" @@ -50,30 +50,30 @@ def _cxx_standard(default, override): # Options common to both c and c++ code def _common_cc_opts(nocopts, pedantic = False): return select({ - Label("//cc/constraints:gcc-6"): [copt for copt in GCC6_COPTS if copt not in nocopts], - Label("//cc/constraints:gcc-5"): [copt for copt in GCC5_COPTS if copt not in nocopts], + Label("@rules_swiftnav//cc/constraints:gcc-6"): [copt for copt in GCC6_COPTS if copt not in nocopts], + Label("@rules_swiftnav//cc/constraints:gcc-5"): [copt for copt in GCC5_COPTS if copt not in nocopts], "//conditions:default": [copt for copt in DEFAULT_COPTS if copt not in nocopts], }) + select({ - Label("//cc:_disable_warnings_as_errors"): [], + Label("@rules_swiftnav//cc:_disable_warnings_as_errors"): [], "//conditions:default": ["-Werror"], }) + ["-pedantic"] if pedantic else [] # Options specific to C++ language standard def _common_cxx_standard_opts(standard = None): return select({ - Label("//cc:cxx17"): [_cxx_standard("-std=c++17", standard)], - Label("//cc:cxx20"): [_cxx_standard("-std=c++20", standard)], - Label("//cc:cxx23"): [_cxx_standard("-std=c++23", standard)], + Label("@rules_swiftnav//cc:cxx17"): [_cxx_standard("-std=c++17", standard)], + Label("@rules_swiftnav//cc:cxx20"): [_cxx_standard("-std=c++20", standard)], + Label("@rules_swiftnav//cc:cxx23"): [_cxx_standard("-std=c++23", standard)], "//conditions:default": [_cxx_standard("-std=c++14", standard)], }) # Options specific to c++ code (exceptions, rtti, etc..) def _common_cxx_opts(exceptions = False, rtti = False, standard = None): return select({ - Label("//cc:_enable_exceptions"): ["-fexceptions"], + Label("@rules_swiftnav//cc:_enable_exceptions"): ["-fexceptions"], "//conditions:default": ["-fno-exceptions" if not exceptions else "-fexceptions"], }) + select({ - Label("//cc:_enable_rtti"): ["-frtti"], + Label("@rules_swiftnav//cc:_enable_rtti"): ["-frtti"], "//conditions:default": ["-fno-rtti" if not rtti else "-frtti"], }) + _common_cxx_standard_opts(standard) @@ -84,14 +84,14 @@ def _construct_local_includes(local_includes): # Handle whether to link statically def _link_static(linkstatic = True): return select({ - Label("//cc:_enable_shared"): False, + Label("@rules_swiftnav//cc:_enable_shared"): False, "//conditions:default": linkstatic, }) # Disable building when --//:disable_tests=true or when building on windows def _test_compatible_with(): return select({ - Label("//cc:_disable_tests"): ["@platforms//:incompatible"], + Label("@rules_swiftnav//cc:_disable_tests"): ["@platforms//:incompatible"], "@platforms//os:windows": ["@platforms//:incompatible"], "//conditions:default": [], }) @@ -114,13 +114,13 @@ def _symbolizer_env(val): return select({ # The + operator is not supported on dict and select types so we need to be # clever here. - Label("//cc:enable_symbolizer_x86_64_linux"): dict(val, **{ + Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_linux"): dict(val, **{ "ASAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", "UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", "MSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", "TSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", }), - Label("//cc:enable_symbolizer_x86_64_darwin"): dict(val, **{ + Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_darwin"): dict(val, **{ "ASAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)", "UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)", "MSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)", @@ -131,15 +131,15 @@ def _symbolizer_env(val): def _symbolizer_data(): return select({ - Label("//cc:enable_symbolizer_x86_64_linux"): ["@x86_64-linux-llvm//:symbolizer"], - Label("//cc:enable_symbolizer_x86_64_darwin"): ["@x86_64-darwin-llvm//:symbolizer"], + Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_linux"): ["@x86_64-linux-llvm//:symbolizer"], + Label("@rules_swiftnav//cc:enable_symbolizer_x86_64_darwin"): ["@x86_64-darwin-llvm//:symbolizer"], "//conditions:default": [], }) # Handle whether to enable -Wdeprecated-declarations in tests. def _tests_warn_deprecated_declarations(): return select({ - Label("//cc:_tests_warn_deprecated_declarations"): [], + Label("@rules_swiftnav//cc:_tests_warn_deprecated_declarations"): [], "//conditions:default": ["-Wno-deprecated-declarations"], }) diff --git a/cc/repositories.bzl b/cc/repositories.bzl index 13365fc..828671c 100644 --- a/cc/repositories.bzl +++ b/cc/repositories.bzl @@ -10,7 +10,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") -load("//cc/toolchains/yocto_generic:yocto_generic.bzl", "yocto_generic") +load("@rules_swiftnav//cc/toolchains/yocto_generic:yocto_generic.bzl", "yocto_generic") AARCH64_DARWIN_LLVM = "https://github.com/swift-nav/swift-toolchains/releases/download/llvm-14.0.0/clang%2Bllvm-14.0.0-arm64-apple-darwin.tar.gz" @@ -35,7 +35,7 @@ X86_64_LINUX_GCC_ARM_EMBEDDED = "https://github.com/swift-nav/swift-toolchains/r # Fixes a bug in libcpp that removed the std::allocator specialization # when building with c++20. This was patched in llvm-15 so once we upgrade to # that this will no longer be necessary. -LLVM_PATCH_FILE = [Label("//cc/toolchains/llvm:llvm.patch")] +LLVM_PATCH_FILE = [Label("@rules_swiftnav//cc/toolchains/llvm:llvm.patch")] # Use p1 for patches generated with git. LLVM_PATCH_ARGS = ["-p1"] @@ -44,7 +44,7 @@ def swift_cc_toolchain(): maybe( http_archive, name = "aarch64-darwin-llvm", - build_file = Label("//cc/toolchains/llvm:llvm.BUILD.bzl"), + build_file = Label("@rules_swiftnav//cc/toolchains/llvm:llvm.BUILD.bzl"), patch_args = LLVM_PATCH_ARGS, patches = LLVM_PATCH_FILE, url = AARCH64_DARWIN_LLVM, @@ -57,7 +57,7 @@ def swift_cc_toolchain(): name = "x86_64-darwin-llvm", patch_args = LLVM_PATCH_ARGS, patches = LLVM_PATCH_FILE, - build_file = Label("//cc/toolchains/llvm:llvm.BUILD.bzl"), + build_file = Label("@rules_swiftnav//cc/toolchains/llvm:llvm.BUILD.bzl"), url = X86_64_DARWIN_LLVM, strip_prefix = "clang+llvm-14.0.0-x86_64-apple-darwin", sha256 = "cf5af0f32d78dcf4413ef6966abbfd5b1445fe80bba57f2ff8a08f77e672b9b3", @@ -68,7 +68,7 @@ def swift_cc_toolchain(): name = "aarch64-linux-llvm", patch_args = LLVM_PATCH_ARGS, patches = LLVM_PATCH_FILE, - build_file = Label("//cc/toolchains/llvm:llvm.BUILD.bzl"), + build_file = Label("@rules_swiftnav//cc/toolchains/llvm:llvm.BUILD.bzl"), url = AARCH64_LINUX_LLVM, strip_prefix = "clang+llvm-14.0.0-aarch64-linux-gnu", sha256 = "1792badcd44066c79148ffeb1746058422cc9d838462be07e3cb19a4b724a1ee", @@ -77,7 +77,7 @@ def swift_cc_toolchain(): maybe( http_archive, name = "x86_64-linux-llvm", - build_file = Label("//cc/toolchains/llvm:llvm.BUILD.bzl"), + build_file = Label("@rules_swiftnav//cc/toolchains/llvm:llvm.BUILD.bzl"), patch_args = LLVM_PATCH_ARGS, patches = LLVM_PATCH_FILE, url = X86_64_LINUX_LLVM, diff --git a/cc/toolchains/gcc_arm_embedded/BUILD.bazel b/cc/toolchains/gcc_arm_embedded/BUILD.bazel index a6e8278..49039fd 100644 --- a/cc/toolchains/gcc_arm_embedded/BUILD.bazel +++ b/cc/toolchains/gcc_arm_embedded/BUILD.bazel @@ -81,31 +81,31 @@ config( name = "config", c_opts = select( { - "//cc/constraints:cortex-m4": [ + "@rules_swiftnav//cc/constraints:cortex-m4": [ "-mcpu=cortex-m4", "-march=armv7e-m", "-mthumb", "-mfloat-abi=hard", "-mfpu=fpv4-sp-d16", ], - "//cc/constraints:cortex-m7": [ + "@rules_swiftnav//cc/constraints:cortex-m7": [ "-mcpu=cortex-m7", "-mthumb", "-mfpu=fpv5-d16", "-mfloat-abi=hard", ], - "//cc/constraints:cortex-m3": [ + "@rules_swiftnav//cc/constraints:cortex-m3": [ "-mcpu=cortex-m3", "-march=armv7-m", "-mthumb", "-msoft-float", ], - "//cc/constraints:cortex-a7": [ + "@rules_swiftnav//cc/constraints:cortex-a7": [ "-mcpu=cortex-a7", "-mfloat-abi=hard", "-mfpu=neon-vfpv4", ], - "//cc/constraints:cortex-a9": [ + "@rules_swiftnav//cc/constraints:cortex-a9": [ "-mcpu=cortex-a9", "-march=armv7-a", "-mthumb", @@ -141,7 +141,7 @@ toolchain( ], target_compatible_with = [ "@platforms//os:none", - "//cc/constraints:gcc_arm_cpu", + "@rules_swiftnav//cc/constraints:gcc_arm_cpu", ], toolchain = ":cc_toolchain", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", diff --git a/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel b/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel index 8375e3d..13e3a85 100644 --- a/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel +++ b/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel @@ -110,7 +110,7 @@ toolchain( target_compatible_with = [ "@platforms//os:linux", "@platforms//cpu:aarch64", - "//cc/toolchains/gcc_arm_gnu_8_3:gcc_arm_gnu_8_3_toolchain", + "@rules_swiftnav//cc/toolchains/gcc_arm_gnu_8_3:gcc_arm_gnu_8_3_toolchain", ], toolchain = ":cc_toolchain", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", diff --git a/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel b/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel index f908300..0b66795 100644 --- a/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel +++ b/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel @@ -8,10 +8,10 @@ # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -package(default_visibility = ["//visibility:public"]) +load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") +load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_DARWIN") -load("//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") -load("//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_DARWIN") +package(default_visibility = ["//visibility:public"]) filegroup( name = "wrappers", @@ -144,7 +144,7 @@ toolchain( target_compatible_with = [ "@platforms//cpu:aarch64", "@platforms//os:macos", - "//cc/constraints:llvm_toolchain", + "@rules_swiftnav//cc/constraints:llvm_toolchain", ], target_settings = None, toolchain = ":cc-clang-aarch64-darwin", diff --git a/cc/toolchains/llvm/aarch64-linux/BUILD.bazel b/cc/toolchains/llvm/aarch64-linux/BUILD.bazel index c58bdba..61daf65 100644 --- a/cc/toolchains/llvm/aarch64-linux/BUILD.bazel +++ b/cc/toolchains/llvm/aarch64-linux/BUILD.bazel @@ -8,10 +8,10 @@ # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -package(default_visibility = ["//visibility:public"]) +load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") +load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX") -load("//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") -load("//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX") +package(default_visibility = ["//visibility:public"]) filegroup( name = "wrappers", @@ -27,7 +27,7 @@ filegroup( ":wrappers", "@aarch64-linux-llvm//:ar", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@aarch64-sysroot"], }), ) @@ -38,7 +38,7 @@ filegroup( ":wrappers", "@aarch64-linux-llvm//:as", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@aarch64-sysroot"], }), ) @@ -50,7 +50,7 @@ filegroup( "@aarch64-linux-llvm//:clang", "@aarch64-linux-llvm//:include", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@aarch64-sysroot"], }), ) @@ -61,7 +61,7 @@ filegroup( ":wrappers", "@aarch64-linux-llvm//:dwp", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@aarch64-sysroot"], }), ) @@ -75,7 +75,7 @@ filegroup( "@aarch64-linux-llvm//:ld", "@aarch64-linux-llvm//:lib", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@aarch64-sysroot"], }), ) @@ -86,7 +86,7 @@ filegroup( ":wrappers", "@aarch64-linux-llvm//:objcopy", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@aarch64-sysroot"], }), ) @@ -106,7 +106,7 @@ filegroup( ":compiler_files", "@aarch64-linux-llvm//:bin", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@aarch64-sysroot"], }), ) @@ -116,12 +116,12 @@ cc_toolchain_config( abi_libc_version = "glibc_unknown", abi_version = "clang", builtin_sysroot = select({ - "//cc:_use_libcpp": None, + "@rules_swiftnav//cc:_use_libcpp": None, "//conditions:default": "external/aarch64-sysroot", }), compiler = "clang", cxx_builtin_include_directories = select({ - "//cc:_use_libcpp": [ + "@rules_swiftnav//cc:_use_libcpp": [ "/include", "/usr/include", "/usr/local/include", @@ -171,7 +171,7 @@ toolchain( target_compatible_with = [ "@platforms//cpu:aarch64", "@platforms//os:linux", - "//cc/constraints:llvm_toolchain", + "@rules_swiftnav//cc/constraints:llvm_toolchain", ], target_settings = None, toolchain = ":cc-clang-aarch64-linux", diff --git a/cc/toolchains/llvm/cc_toolchain_config.bzl b/cc/toolchains/llvm/cc_toolchain_config.bzl index 9407103..647451f 100644 --- a/cc/toolchains/llvm/cc_toolchain_config.bzl +++ b/cc/toolchains/llvm/cc_toolchain_config.bzl @@ -8,11 +8,11 @@ # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. +load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "is_target_triplet") load( "unix_cc_toolchain_config.bzl", unix_cc_toolchain_config = "cc_toolchain_config", ) -load("//cc/toolchains/llvm:target_triplets.bzl", "is_target_triplet") def cc_toolchain_config( name, @@ -78,9 +78,9 @@ def cc_toolchain_config( ] cxx_flags = select({ - "//cc:global_cxx17": ["-std=c++17"], - "//cc:global_cxx20": ["-std=c++20"], - "//cc:global_cxx23": ["-std=c++23"], + "@rules_swiftnav//cc:global_cxx17": ["-std=c++17"], + "@rules_swiftnav//cc:global_cxx20": ["-std=c++20"], + "@rules_swiftnav//cc:global_cxx23": ["-std=c++23"], "//conditions:default": ["-std=c++14"], }) diff --git a/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel b/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel index c8903ee..1226d54 100644 --- a/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel +++ b/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel @@ -8,10 +8,10 @@ # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -package(default_visibility = ["//visibility:public"]) +load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") +load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX", "X86_64_LINUX") -load("//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") -load("//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX", "X86_64_LINUX") +package(default_visibility = ["//visibility:public"]) filegroup( name = "wrappers", @@ -107,8 +107,8 @@ cc_toolchain_config( "%sysroot%/usr/include", ], extra_copts = select({ - "//cc/constraints:graviton2": ["-mcpu=neoverse-n1"], - "//cc/constraints:graviton3": ["-mcpu=neoverse-512tvb"], + "@rules_swiftnav//cc/constraints:graviton2": ["-mcpu=neoverse-n1"], + "@rules_swiftnav//cc/constraints:graviton3": ["-mcpu=neoverse-512tvb"], }), host_system_name = X86_64_LINUX, target_cpu = "k8", @@ -153,9 +153,9 @@ toolchain( target_compatible_with = [ "@platforms//os:linux", "@platforms//cpu:aarch64", - "//cc/constraints:glibc_2_31", - "//cc/constraints:graviton2", - "//cc/constraints:llvm_toolchain", + "@rules_swiftnav//cc/constraints:glibc_2_31", + "@rules_swiftnav//cc/constraints:graviton2", + "@rules_swiftnav//cc/constraints:llvm_toolchain", ], target_settings = None, toolchain = ":cc-clang-x86_64-aarch64-linux", @@ -171,9 +171,9 @@ toolchain( target_compatible_with = [ "@platforms//os:linux", "@platforms//cpu:aarch64", - "//cc/constraints:glibc_2_31", - "//cc/constraints:graviton3", - "//cc/constraints:llvm_toolchain", + "@rules_swiftnav//cc/constraints:glibc_2_31", + "@rules_swiftnav//cc/constraints:graviton3", + "@rules_swiftnav//cc/constraints:llvm_toolchain", ], target_settings = None, toolchain = ":cc-clang-x86_64-aarch64-linux", diff --git a/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel b/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel index 05fb405..e6fb65d 100644 --- a/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel +++ b/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel @@ -8,10 +8,10 @@ # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -package(default_visibility = ["//visibility:public"]) +load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") +load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "X86_64_DARWIN") -load("//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") -load("//cc/toolchains/llvm:target_triplets.bzl", "X86_64_DARWIN") +package(default_visibility = ["//visibility:public"]) filegroup( name = "wrappers", @@ -144,7 +144,7 @@ toolchain( target_compatible_with = [ "@platforms//cpu:x86_64", "@platforms//os:macos", - "//cc/constraints:llvm_toolchain", + "@rules_swiftnav//cc/constraints:llvm_toolchain", ], target_settings = None, toolchain = ":cc-clang-x86_64-darwin", diff --git a/cc/toolchains/llvm/x86_64-linux/BUILD.bazel b/cc/toolchains/llvm/x86_64-linux/BUILD.bazel index 86b8cc4..b6184db 100644 --- a/cc/toolchains/llvm/x86_64-linux/BUILD.bazel +++ b/cc/toolchains/llvm/x86_64-linux/BUILD.bazel @@ -8,10 +8,10 @@ # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. -package(default_visibility = ["//visibility:public"]) +load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") +load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "X86_64_LINUX") -load("//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config") -load("//cc/toolchains/llvm:target_triplets.bzl", "X86_64_LINUX") +package(default_visibility = ["//visibility:public"]) filegroup( name = "wrappers", @@ -27,7 +27,7 @@ filegroup( ":wrappers", "@x86_64-linux-llvm//:ar", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@x86_64-sysroot"], }), ) @@ -38,7 +38,7 @@ filegroup( ":wrappers", "@x86_64-linux-llvm//:as", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@x86_64-sysroot"], }), ) @@ -50,7 +50,7 @@ filegroup( "@x86_64-linux-llvm//:clang", "@x86_64-linux-llvm//:include", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@x86_64-sysroot"], }), ) @@ -61,7 +61,7 @@ filegroup( ":wrappers", "@x86_64-linux-llvm//:dwp", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@x86_64-sysroot"], }), ) @@ -75,7 +75,7 @@ filegroup( "@x86_64-linux-llvm//:ld", "@x86_64-linux-llvm//:lib", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@x86_64-sysroot"], }), ) @@ -86,7 +86,7 @@ filegroup( ":wrappers", "@x86_64-linux-llvm//:objcopy", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@x86_64-sysroot"], }), ) @@ -106,7 +106,7 @@ filegroup( ":compiler_files", "@x86_64-linux-llvm//:bin", ] + select({ - "//cc:_use_libcpp": [], + "@rules_swiftnav//cc:_use_libcpp": [], "//conditions:default": ["@x86_64-sysroot"], }), ) @@ -116,12 +116,12 @@ cc_toolchain_config( abi_libc_version = "glibc_unknown", abi_version = "clang", builtin_sysroot = select({ - "//cc:_use_libcpp": None, + "@rules_swiftnav//cc:_use_libcpp": None, "//conditions:default": "external/x86_64-sysroot", }), compiler = "clang", cxx_builtin_include_directories = select({ - "//cc:_use_libcpp": [ + "@rules_swiftnav//cc:_use_libcpp": [ "/include", "/usr/include", "/usr/local/include", @@ -171,7 +171,7 @@ toolchain( target_compatible_with = [ "@platforms//cpu:x86_64", "@platforms//os:linux", - "//cc/constraints:llvm_toolchain", + "@rules_swiftnav//cc/constraints:llvm_toolchain", ], target_settings = None, toolchain = ":cc-clang-x86_64-linux", diff --git a/cc/toolchains/musl/aarch64/BUILD.bazel b/cc/toolchains/musl/aarch64/BUILD.bazel index f0f069a..7506e32 100644 --- a/cc/toolchains/musl/aarch64/BUILD.bazel +++ b/cc/toolchains/musl/aarch64/BUILD.bazel @@ -104,7 +104,7 @@ toolchain( target_compatible_with = [ "@platforms//os:linux", "@platforms//cpu:aarch64", - "//cc/constraints:musl", + "@rules_swiftnav//cc/constraints:musl", ], toolchain = ":cc_toolchain", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", diff --git a/cc/toolchains/musl/armhf/BUILD.bazel b/cc/toolchains/musl/armhf/BUILD.bazel index c62e805..ac0b01e 100644 --- a/cc/toolchains/musl/armhf/BUILD.bazel +++ b/cc/toolchains/musl/armhf/BUILD.bazel @@ -104,7 +104,7 @@ toolchain( target_compatible_with = [ "@platforms//os:linux", "@platforms//cpu:arm", - "//cc/constraints:musl", + "@rules_swiftnav//cc/constraints:musl", ], toolchain = ":cc_toolchain", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", diff --git a/cc/toolchains/musl/x86_64/BUILD.bazel b/cc/toolchains/musl/x86_64/BUILD.bazel index 0a11c16..fd6ff10 100644 --- a/cc/toolchains/musl/x86_64/BUILD.bazel +++ b/cc/toolchains/musl/x86_64/BUILD.bazel @@ -104,7 +104,7 @@ toolchain( target_compatible_with = [ "@platforms//os:linux", "@platforms//cpu:x86_64", - "//cc/constraints:musl", + "@rules_swiftnav//cc/constraints:musl", ], toolchain = ":cc_toolchain", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", diff --git a/cc/toolchains/yocto_generic/BUILD.bazel b/cc/toolchains/yocto_generic/BUILD.bazel index 6d20285..7693977 100644 --- a/cc/toolchains/yocto_generic/BUILD.bazel +++ b/cc/toolchains/yocto_generic/BUILD.bazel @@ -35,7 +35,7 @@ toolchain( # In this context this constraint implies you # can use this toolchain for gcc-5 and up. "@rules_swiftnav//cc/constraints:gcc-5", - "//cc/constraints:yocto_generic_toolchain", + "@rules_swiftnav//cc/constraints:yocto_generic_toolchain", ], toolchain = ":cc_toolchain", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", diff --git a/platforms/BUILD.bazel b/platforms/BUILD.bazel index a541c3f..a7990e9 100644 --- a/platforms/BUILD.bazel +++ b/platforms/BUILD.bazel @@ -30,7 +30,7 @@ platform( name = "cortex_m4_none_eabi", constraint_values = [ "@platforms//os:none", - "//cc/constraints:cortex-m4", + "@rules_swiftnav//cc/constraints:cortex-m4", ], visibility = ["//visibility:public"], ) @@ -39,7 +39,7 @@ platform( name = "cortex_m7_none_eabi", constraint_values = [ "@platforms//os:none", - "//cc/constraints:cortex-m7", + "@rules_swiftnav//cc/constraints:cortex-m7", ], visibility = ["//visibility:public"], ) @@ -48,7 +48,7 @@ platform( name = "cortex_m3_none_eabi", constraint_values = [ "@platforms//os:none", - "//cc/constraints:cortex-m3", + "@rules_swiftnav//cc/constraints:cortex-m3", ], visibility = ["//visibility:public"], ) @@ -57,7 +57,7 @@ platform( name = "cortex_a7_none_eabi", constraint_values = [ "@platforms//os:none", - "//cc/constraints:cortex-a7", + "@rules_swiftnav//cc/constraints:cortex-a7", ], visibility = ["//visibility:public"], ) @@ -66,7 +66,7 @@ platform( name = "cortex_a9_none_eabi", constraint_values = [ "@platforms//os:none", - "//cc/constraints:cortex-a9", + "@rules_swiftnav//cc/constraints:cortex-a9", ], visibility = ["//visibility:public"], ) @@ -75,7 +75,7 @@ platform( name = "arm_none_eabi", constraint_values = [ "@platforms//os:none", - "//cc/constraints:unspecified_arm", + "@rules_swiftnav//cc/constraints:unspecified_arm", ], visibility = ["//visibility:public"], ) @@ -85,7 +85,7 @@ platform( constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64", - "//cc/constraints:musl", + "@rules_swiftnav//cc/constraints:musl", ], visibility = ["//visibility:public"], ) @@ -95,7 +95,7 @@ platform( constraint_values = [ "@platforms//os:linux", "@platforms//cpu:arm", - "//cc/constraints:musl", + "@rules_swiftnav//cc/constraints:musl", ], visibility = ["//visibility:public"], ) @@ -115,7 +115,7 @@ platform( constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64", - "//cc/constraints:musl", + "@rules_swiftnav//cc/constraints:musl", ], visibility = ["//visibility:public"], ) @@ -134,7 +134,7 @@ platform( constraint_values = [ "@platforms//os:linux", "@rules_swiftnav//cc/constraints:gcc-5", - "//cc/constraints:yocto_generic_toolchain", + "@rules_swiftnav//cc/constraints:yocto_generic_toolchain", ], visibility = ["//visibility:public"], ) @@ -144,7 +144,7 @@ platform( constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64", - "//cc/constraints:glibc_2_31", + "@rules_swiftnav//cc/constraints:glibc_2_31", ], visibility = ["//visibility:public"], ) @@ -154,8 +154,8 @@ platform( constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64", - "//cc/constraints:graviton2", - "//cc/constraints:glibc_2_31", + "@rules_swiftnav//cc/constraints:graviton2", + "@rules_swiftnav//cc/constraints:glibc_2_31", ], visibility = ["//visibility:public"], ) @@ -165,8 +165,8 @@ platform( constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64", - "//cc/constraints:graviton3", - "//cc/constraints:glibc_2_31", + "@rules_swiftnav//cc/constraints:graviton3", + "@rules_swiftnav//cc/constraints:glibc_2_31", ], visibility = ["//visibility:public"], )