From 670276e5be3474d58e54290347274e65087c64d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 8 Jun 2021 05:06:58 +0300 Subject: [PATCH] rename directory --- WORKSPACE | 2 +- {zig-toolchains => toolchain}/BUILD | 0 {zig-toolchains => toolchain}/defs.bzl | 5 +---- {zig-toolchains => toolchain}/zig_toolchain.bzl | 0 4 files changed, 2 insertions(+), 5 deletions(-) rename {zig-toolchains => toolchain}/BUILD (100%) rename {zig-toolchains => toolchain}/defs.bzl (97%) rename {zig-toolchains => toolchain}/zig_toolchain.bzl (100%) diff --git a/WORKSPACE b/WORKSPACE index 3d4acd2..496676c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -48,7 +48,7 @@ http_archive( url = "https://github.com/bazelbuild/buildtools/archive/master.zip", ) -load("//zig-toolchains:defs.bzl", +load("//toolchain:defs.bzl", zig_register_all_toolchains = "register_all_toolchains", zig_toolchain_repositories = "toolchain_repositories", ) diff --git a/zig-toolchains/BUILD b/toolchain/BUILD similarity index 100% rename from zig-toolchains/BUILD rename to toolchain/BUILD diff --git a/zig-toolchains/defs.bzl b/toolchain/defs.bzl similarity index 97% rename from zig-toolchains/defs.bzl rename to toolchain/defs.bzl index 54c3103..f26a425 100644 --- a/zig-toolchains/defs.bzl +++ b/toolchain/defs.bzl @@ -35,9 +35,6 @@ TARGET_CONFIGS = [ constraint_values=["@platforms//os:macos", "@platforms//cpu:x86_64"], tool_paths={"ld": "ld64.lld"}, ), - # If this gets uncommented, bazel will put `-target <...>gnu`, even if - # the platform is explicitly set to: - # --platforms=@com_github_ziglang_zig//:x86_64-linux-musl struct( target="x86_64-linux-gnu.2.19", includes=[ @@ -119,7 +116,7 @@ ZIG_TOOLS = [ ] BUILD = """ -load("@zig-cc-bazel//zig-toolchains:defs.bzl", "zig_build_macro") +load("@zig-cc-bazel//toolchain:defs.bzl", "zig_build_macro") package(default_visibility = ["//visibility:public"]) zig_build_macro(absolute_path={absolute_path}, zig_include_root={zig_include_root}) diff --git a/zig-toolchains/zig_toolchain.bzl b/toolchain/zig_toolchain.bzl similarity index 100% rename from zig-toolchains/zig_toolchain.bzl rename to toolchain/zig_toolchain.bzl