Revert "Simplify setting up LLVM as bazel external repo"

[GMNGeoffrey]

Summary

This breaks the rules for creating repository dependencies when invoked
from another workspace. See comment on https://reviews.llvm.org/D107714

This reverts commit 934f084ad42231d225bd0eee3342f4b5f7e1ce6e.

utils/bazel/WORKSPACE

http_archive(
     name = "bazel_skylib",
     sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
     urls = [
         "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version=SKYLIB_VERSION),
         "https://github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version=SKYLIB_VERSION),
     ],
 )
 
-new_local_repository(
-    name = "llvm-archive",
-    path = "../../",
-    build_file_content = "# empty",
-)
-
-load("@llvm-archive//utils/bazel:configure.bzl", "llvm_configure")
+load(":configure.bzl", "llvm_configure")
 
-llvm_configure(name = "llvm-project")
+llvm_configure(
+    name = "llvm-project",
+    overlay_path = "llvm-project-overlay",
+    src_path = "../..",
+)
 
 load(":terminfo.bzl", "llvm_terminfo_from_env")
 
 maybe(
     llvm_terminfo_from_env,
     name = "llvm_terminfo",
 )
 

utils/bazel/configure.bzl

 # This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 """Helper macros to configure the LLVM overlay project."""
 
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@bazel_skylib//lib:paths.bzl", "paths")
 load(":zlib.bzl", "llvm_zlib_disable", "llvm_zlib_system")
 load(":terminfo.bzl", "llvm_terminfo_disable", "llvm_terminfo_system")
 
 # Directory of overlay files relative to WORKSPACE
 DEFAULT_OVERLAY_PATH = "llvm-project-overlay"
 
 DEFAULT_TARGETS = [
     "AArch64",
DEFAULT_TARGETS = [
     "Sparc",
     "SystemZ",
     "WebAssembly",
     "X86",
     "XCore",
 ]
 
 def _overlay_directories(repository_ctx):
-    src_path = repository_ctx.path(Label("//:WORKSPACE")).dirname
-    bazel_path = src_path.get_child("utils").get_child("bazel")
-    overlay_path = bazel_path.get_child("llvm-project-overlay")
-    script_path = bazel_path.get_child("overlay_directories.py")
+    src_workspace_path = str(repository_ctx.path(
+        repository_ctx.attr.src_workspace,
+    ).dirname)
+
+    src_path = paths.join(src_workspace_path, repository_ctx.attr.src_path)
+
+    overlay_workspace_path = str(repository_ctx.path(
+        repository_ctx.attr.overlay_workspace,
+    ).dirname)
+    overlay_path = paths.join(
+        overlay_workspace_path,
+        repository_ctx.attr.overlay_path,
+    )
 
+    overlay_script = repository_ctx.path(
+        repository_ctx.attr._overlay_script,
+    )
     python_bin = repository_ctx.which("python3")
     if not python_bin:
         # Windows typically just defines "python" as python3. The script itself
         # contains a check to ensure python3.
         python_bin = repository_ctx.which("python")
 
     if not python_bin:
         fail("Failed to find python3 binary")
 
     cmd = [
         python_bin,
-        script_path,
+        overlay_script,
         "--src",
         src_path,
         "--overlay",
         overlay_path,
         "--target",
         ".",
     ]
     exec_result = repository_ctx.execute(cmd, timeout = 20)
repository_ctx.file(
         executable = False,
     )
 
 llvm_configure = repository_rule(
     implementation = _llvm_configure_impl,
     local = True,
     configure = True,
     attrs = {
+        "_overlay_script": attr.label(
+            default = Label("//:overlay_directories.py"),
+            allow_single_file = True,
+        ),
+        "overlay_workspace": attr.label(default = Label("//:WORKSPACE")),
+        "overlay_path": attr.string(default = DEFAULT_OVERLAY_PATH),
+        "src_workspace": attr.label(default = Label("//:WORKSPACE")),
+        "src_path": attr.string(mandatory = True),
         "targets": attr.string_list(default = DEFAULT_TARGETS),
     },
 )
 
 def llvm_disable_optional_support_deps():
     maybe(
         llvm_zlib_disable,
         name = "llvm_zlib",

utils/bazel/examples/http_archive/WORKSPACE

 # This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 """An example WORKSPACE for configuring LLVM using http_archive."""
 
 workspace(name = "http_archive_example")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 SKYLIB_VERSION = "1.0.3"
 
 http_archive(
     name = "bazel_skylib",
     sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version = SKYLIB_VERSION),
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version = SKYLIB_VERSION),
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version=SKYLIB_VERSION),
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/{version}/bazel-skylib-{version}.tar.gz".format(version=SKYLIB_VERSION),
     ],
 )
 
 # Replace with the LLVM commit you want to use.
 LLVM_COMMIT = "09ac97ce350316b95b8cddb796d52f71b6f68296"
 
 # The easiest way to calculate this for a new commit is to set it to empty and
 # then run a bazel build and it will report the digest necessary to cache the