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

31–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

27 ↗

(On Diff #366997)

Same as above. We should be loading llvm_disable_optional_support_deps here

[GMNGeoffrey]

utils/bazel/examples/submodule/WORKSPACE

21 ↗

(On Diff #366997)

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 = "81d5412439efd0860c0a8dd51b831204f118d485"
 
 # 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"
-
-# FIXME: It shouldn't be necessary to use http_archive twice here. Caching
-# should mean that this isn't too expensive though.
+LLVM_SHA256 = "50b3ef31b228ea0c96ae074005bfac087c56e6a4b1c147592dd33f41cad0706b"
 
 http_archive(
-    name = "llvm-project-raw",
-    build_file_content = "#empty",
+    name = "llvm-raw",
+    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-raw//utils/bazel:configure.bzl", "llvm_configure", "llvm_disable_optional_support_deps")
 
-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()