From 9b3af5af76ab05eb1e4e1c3f374526b731c11c4a Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 13 Mar 2023 11:45:50 +0100
Subject: [PATCH] bazel: move toolchains into bazel folder

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 3rdparty/bazel/org_openssl/BUILD.openssl.bazel |  2 +-
 WORKSPACE.bazel                                | 18 +++++++++---------
 {toolchains => bazel/toolchains}/BUILD.bazel   |  0
 .../toolchains}/buildifier_deps.bzl            |  0
 {toolchains => bazel/toolchains}/dnf_deps.bzl  |  0
 .../toolchains}/go_module_deps.bzl             |  0
 .../toolchains}/go_rules_deps.bzl              |  0
 {toolchains => bazel/toolchains}/java_deps.bzl |  0
 {toolchains => bazel/toolchains}/oci_deps.bzl  |  0
 {toolchains => bazel/toolchains}/pkg_deps.bzl  |  0
 .../toolchains}/proto_deps.bzl                 |  0
 .../toolchains}/zig_cc_deps.bzl                |  0
 12 files changed, 10 insertions(+), 10 deletions(-)
 rename {toolchains => bazel/toolchains}/BUILD.bazel (100%)
 rename {toolchains => bazel/toolchains}/buildifier_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/dnf_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/go_module_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/go_rules_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/java_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/oci_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/pkg_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/proto_deps.bzl (100%)
 rename {toolchains => bazel/toolchains}/zig_cc_deps.bzl (100%)

diff --git a/3rdparty/bazel/org_openssl/BUILD.openssl.bazel b/3rdparty/bazel/org_openssl/BUILD.openssl.bazel
index 7e361ed72..fde161d4c 100644
--- a/3rdparty/bazel/org_openssl/BUILD.openssl.bazel
+++ b/3rdparty/bazel/org_openssl/BUILD.openssl.bazel
@@ -80,7 +80,7 @@ configure_make_variant(
         "libcrypto-1_1-x64.dll",
     ],
     targets = MAKE_TARGETS,
-    toolchain = "@rules_foreign_cc//toolchains:preinstalled_nmake_toolchain",
+    toolchain = "@rules_foreign_cc//bazel/toolchains:preinstalled_nmake_toolchain",
     toolchains = ["@rules_perl//:current_toolchain"],
 )
 
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 921730851..28f812ce7 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -1,15 +1,15 @@
-load("//toolchains:java_deps.bzl", "java_deps")
+load("//bazel/toolchains:java_deps.bzl", "java_deps")
 
 java_deps()
 
 # Go toolchain
-load("//toolchains:go_rules_deps.bzl", "go_deps")
+load("//bazel/toolchains:go_rules_deps.bzl", "go_deps")
 
 go_deps()
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-load("//toolchains:go_module_deps.bzl", "go_dependencies")
+load("//bazel/toolchains:go_module_deps.bzl", "go_dependencies")
 
 # gazelle:repository_macro toolchains/go_module_deps.bzl%go_dependencies
 go_dependencies()
@@ -23,7 +23,7 @@ gazelle_dependencies(go_repository_default_config = "//:WORKSPACE.bazel")
 # gazelle:repo bazel_gazelle
 
 # proto toolchain
-load("//toolchains:proto_deps.bzl", "proto_deps")
+load("//bazel/toolchains:proto_deps.bzl", "proto_deps")
 
 proto_deps()
 
@@ -35,7 +35,7 @@ rules_proto_toolchains()
 
 # dnf / rpm toolchain
 
-load("//toolchains:dnf_deps.bzl", "dnf_deps")
+load("//bazel/toolchains:dnf_deps.bzl", "dnf_deps")
 
 dnf_deps()
 
@@ -48,13 +48,13 @@ load("//rpm:rpms.bzl", "rpms")
 rpms()
 
 # Buildifier
-load("//toolchains:buildifier_deps.bzl", "buildifier_deps")
+load("//bazel/toolchains:buildifier_deps.bzl", "buildifier_deps")
 
 buildifier_deps()
 
 # C / C++ toolchains
 
-load("//toolchains:zig_cc_deps.bzl", "zig_cc_deps")
+load("//bazel/toolchains:zig_cc_deps.bzl", "zig_cc_deps")
 
 zig_cc_deps()
 
@@ -111,7 +111,7 @@ load("//3rdparty/bazel/org_openssl:openssl_setup.bzl", "openssl_setup")
 openssl_setup()
 
 # Packaging rules (tar)
-load("//toolchains:pkg_deps.bzl", "pkg_deps")
+load("//bazel/toolchains:pkg_deps.bzl", "pkg_deps")
 
 pkg_deps()
 
@@ -120,7 +120,7 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 rules_pkg_dependencies()
 
 # OCI rules
-load("//toolchains:oci_deps.bzl", "oci_deps")
+load("//bazel/toolchains:oci_deps.bzl", "oci_deps")
 
 oci_deps()
 
diff --git a/toolchains/BUILD.bazel b/bazel/toolchains/BUILD.bazel
similarity index 100%
rename from toolchains/BUILD.bazel
rename to bazel/toolchains/BUILD.bazel
diff --git a/toolchains/buildifier_deps.bzl b/bazel/toolchains/buildifier_deps.bzl
similarity index 100%
rename from toolchains/buildifier_deps.bzl
rename to bazel/toolchains/buildifier_deps.bzl
diff --git a/toolchains/dnf_deps.bzl b/bazel/toolchains/dnf_deps.bzl
similarity index 100%
rename from toolchains/dnf_deps.bzl
rename to bazel/toolchains/dnf_deps.bzl
diff --git a/toolchains/go_module_deps.bzl b/bazel/toolchains/go_module_deps.bzl
similarity index 100%
rename from toolchains/go_module_deps.bzl
rename to bazel/toolchains/go_module_deps.bzl
diff --git a/toolchains/go_rules_deps.bzl b/bazel/toolchains/go_rules_deps.bzl
similarity index 100%
rename from toolchains/go_rules_deps.bzl
rename to bazel/toolchains/go_rules_deps.bzl
diff --git a/toolchains/java_deps.bzl b/bazel/toolchains/java_deps.bzl
similarity index 100%
rename from toolchains/java_deps.bzl
rename to bazel/toolchains/java_deps.bzl
diff --git a/toolchains/oci_deps.bzl b/bazel/toolchains/oci_deps.bzl
similarity index 100%
rename from toolchains/oci_deps.bzl
rename to bazel/toolchains/oci_deps.bzl
diff --git a/toolchains/pkg_deps.bzl b/bazel/toolchains/pkg_deps.bzl
similarity index 100%
rename from toolchains/pkg_deps.bzl
rename to bazel/toolchains/pkg_deps.bzl
diff --git a/toolchains/proto_deps.bzl b/bazel/toolchains/proto_deps.bzl
similarity index 100%
rename from toolchains/proto_deps.bzl
rename to bazel/toolchains/proto_deps.bzl
diff --git a/toolchains/zig_cc_deps.bzl b/bazel/toolchains/zig_cc_deps.bzl
similarity index 100%
rename from toolchains/zig_cc_deps.bzl
rename to bazel/toolchains/zig_cc_deps.bzl