diff options
| author | Christian Sigg <csigg@google.com> | 2021-08-18 09:14:42 +0200 |
|---|---|---|
| committer | Christian Sigg <csigg@google.com> | 2021-08-19 09:37:26 +0200 |
| commit | 81d5412439efd0860c0a8dd51b831204f118d485 (patch) | |
| tree | 25b224a2d84c20a90fa045c79303c7ee7ffe9be8 /utils/bazel/WORKSPACE | |
| parent | 96fbd5cd5e442bd01172d0d4491a2ef19876621f (diff) | |
| download | llvm-81d5412439efd0860c0a8dd51b831204f118d485.zip llvm-81d5412439efd0860c0a8dd51b831204f118d485.tar.gz llvm-81d5412439efd0860c0a8dd51b831204f118d485.tar.bz2 | |
Simplify setting up LLVM as bazel external repo
Only require one intermediate repository instead of two.
Fewer parameters in llvm_config.
Second attempt of https://reviews.llvm.org/D107714, this time also updating `third_party_build` and `deps_impl` paths.
Reviewed By: GMNGeoffrey
Differential Revision: https://reviews.llvm.org/D108274
Diffstat (limited to 'utils/bazel/WORKSPACE')
| -rw-r--r-- | utils/bazel/WORKSPACE | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/utils/bazel/WORKSPACE b/utils/bazel/WORKSPACE index 84ac1e5..572c9fe 100644 --- a/utils/bazel/WORKSPACE +++ b/utils/bazel/WORKSPACE @@ -16,15 +16,17 @@ http_archive( ], ) -load(":configure.bzl", "llvm_configure") - -llvm_configure( - name = "llvm-project", - overlay_path = "llvm-project-overlay", - src_path = "../..", +new_local_repository( + name = "llvm-raw", + path = "../../", + build_file_content = "# empty", ) -load(":terminfo.bzl", "llvm_terminfo_from_env") +load("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure") + +llvm_configure(name = "llvm-project") + +load("@llvm-raw//utils/bazel:terminfo.bzl", "llvm_terminfo_from_env") maybe( llvm_terminfo_from_env, @@ -34,7 +36,7 @@ maybe( maybe( http_archive, name = "zlib", - build_file = "//third_party_build:zlib.BUILD", + build_file = "@llvm-raw//utils/bazel/third_party_build:zlib.BUILD", sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1", strip_prefix = "zlib-1.2.11", urls = [ @@ -43,7 +45,7 @@ maybe( ], ) -load(":zlib.bzl", "llvm_zlib_from_env") +load("@llvm-raw//utils/bazel:zlib.bzl", "llvm_zlib_from_env") maybe( llvm_zlib_from_env, @@ -54,7 +56,7 @@ maybe( maybe( http_archive, name = "vulkan_headers", - build_file = "//third_party_build:vulkan_headers.BUILD", + build_file = "@llvm-raw//utils/bazel/third_party_build:vulkan_headers.BUILD", sha256 = "19f491784ef0bc73caff877d11c96a48b946b5a1c805079d9006e3fbaa5c1895", strip_prefix = "Vulkan-Headers-9bd3f561bcee3f01d22912de10bb07ce4e23d378", urls = [ @@ -62,7 +64,7 @@ maybe( ], ) -load(":vulkan_sdk.bzl", "vulkan_sdk_setup") +load("@llvm-raw//utils/bazel:vulkan_sdk.bzl", "vulkan_sdk_setup") maybe( vulkan_sdk_setup, |