Update bazel examples.

[csigg]

Summary

Use the simplified repo rules from https://github.com/llvm/llvm-project/commit/934f084.

[csigg]

Put back bazel_skylib.

[GMNGeoffrey]

LGTM with a few fixes

utils/bazel/examples/http_archive/WORKSPACE

30–32

I believe this has been deprecated since initial release (https://docs.bazel.build/versions/0.17.1/be/workspace.html#new_http_archive) and removed since 0.23.0 (https://docs.bazel.build/versions/0.23.0/be/workspace.html). You should just be able to use http_archive

38

This was broken before too, but we need to import llvm_disable_optional_support_deps as well

utils/bazel/examples/submodule/WORKSPACE

17–18

Same as above. We should be loading llvm_disable_optional_support_deps here

[GMNGeoffrey]

utils/bazel/examples/submodule/WORKSPACE

16

Nit: I think I prefer not calling this "archive" here. It's not an archive in this case. I thought llvm-raw was a decent name that worked for both submodule and http_archive.

[GMNGeoffrey]

Per comment on https://reviews.llvm.org/D107714 this new format actually breaks the repository rules for setting up dependencies. I'm going to revert that commit for now and we should hold off on this too

[csigg]

Rebase.

[csigg]

Actually rebase.

[csigg]

Thanks Geoffrey, sorry that my first attempt was quite sloppy. Could you take another look?

[GMNGeoffrey]

In D108237#2953998, @csigg wrote:

Thanks Geoffrey, sorry that my first attempt was quite sloppy. Could you take another look?

Not at all! Thanks for this cleanup :-) I was somewhat at a loss for how to avoid the double http_archive thing.

utils/bazel/examples/http_archive/WORKSPACE

http_archive(
     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),
     ],
 )
 
 # Replace with the LLVM commit you want to use.
-LLVM_COMMIT = "09ac97ce350316b95b8cddb796d52f71b6f68296"
+LLVM_COMMIT = "934f084ad42231d225bd0eee3342f4b5f7e1ce6e"
 
 # 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
 # archive and make the build reproducible.
-LLVM_SHA256 = "2fb1aa06d12f8db349a27426cb0ced062987c5c2a75143c69f4284929e2750ff"
+LLVM_SHA256 = "82c5a82f6ea6638bf6812fdc3e0f2bdd3e45d2db7aada799e09366c1387991c9"
 
-# FIXME: It shouldn't be necessary to use http_archive twice here. Caching
-# should mean that this isn't too expensive though.
-
-http_archive(
-    name = "llvm-project-raw",
-    build_file_content = "#empty",
+new_http_archive(
+    name = "llvm-archive",
+    build_file_content = "# empty",
     sha256 = LLVM_SHA256,
     strip_prefix = "llvm-project-" + LLVM_COMMIT,
     urls = ["https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT)],
 )
 
-http_archive(
-    name = "llvm-bazel",
-    sha256 = LLVM_SHA256,
-    strip_prefix = "llvm-project-{}/utils/bazel".format(LLVM_COMMIT),
-    urls = ["https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT)],
-)
-
-load("@llvm-bazel//:configure.bzl", "llvm_configure", "llvm_disable_optional_support_deps")
+load("@llvm-archive//utils/bazel:configure.bzl", "llvm_configure")
 
-llvm_configure(
-    name = "llvm-project",
-    src_path = ".",
-    src_workspace = "@llvm-project-raw//:WORKSPACE",
-)
+llvm_configure(name = "llvm-project")
 
 # Disables optional dependencies for Support like zlib and terminfo. You may
 # instead want to configure them using the macros in the corresponding bzl
 # files.
 llvm_disable_optional_support_deps()

utils/bazel/examples/submodule/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 a git submodule."""
 
 workspace(name = "submodule_example")
 
-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),
-    ],
-)
-
+new_local_repository(
+    name = "llvm-archive",
+    build_file_content = "# empty",
     # Or wherever your submodule is located.
-SUBMODULE_PATH = "third_party/llvm-project"
-
-local_repository(
-    name = "llvm-bazel",
-    path = SUBMODULE_PATH + "/utils/bazel",
+    path = "third_party/llvm-project",
 )
 
-load("@llvm-bazel//:configure.bzl", "llvm_configure", "llvm_disable_optional_support_deps")
+load("@llvm-archive//utils/bazel:configure.bzl", "llvm_configure")
 
-llvm_configure(
-    name = "llvm-project",
-    src_path = SUBMODULE_PATH,
-    src_workspace = "@submodule_example//:WORKSPACE",
-)
+llvm_configure(name = "llvm-project")
 
 # Disables optional dependencies for Support like zlib and terminfo. You may
 # instead want to configure them using the macros in the corresponding bzl
 # files.
 llvm_disable_optional_support_deps()