Procházet zdrojové kódy

Switch to bazel_dep and normal zlib. (#3526)

The use of zlib-ng seemed to work previously, but may have only done so
because of some combination of an implementation detail of
`strip_include_prefix` in older versions of Bazel and some happenstance
of a system installed `zlib.h` being possible to find. With Bazel 7 it
started breaking on my machine which doesn't have a system `zlib.h`.

Using the "normal" zlib and the bzlmod rigging for it is simple and
seems to work.

Also adds the Linux AArch64 component of the Bazel lock file which was
necessary to test this on my Arm Linux machine.
Chandler Carruth před 2 roky
rodič
revize
16a46dbe01
2 změnil soubory, kde provedl 54 přidání a 82 odebrání
  1. 1 11
      MODULE.bazel
  2. 53 71
      MODULE.bazel.lock

+ 1 - 11
MODULE.bazel

@@ -73,17 +73,7 @@ llvm_project_version = "3d51010a3350660160981c6b8e624dcc87c208a3"
 bazel_dep(name = "platforms", version = "0.0.8")
 
 # zlib and zstd dependencies are copied from
-# https://github.com/llvm/llvm-project/blob/main/utils/bazel/WORKSPACE.
-http_archive(
-    name = "llvm_zlib",
-    build_file = "@llvm-raw//utils/bazel/third_party_build:zlib-ng.BUILD",
-    sha256 = "e36bb346c00472a1f9ff2a0a4643e590a254be6379da7cddd9daeb9a7f296731",
-    strip_prefix = "zlib-ng-2.0.7",
-    urls = [
-        "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.7.zip",
-    ],
-)
-
+bazel_dep(name = "zlib", version = "1.3", repo_name = "llvm_zlib")
 bazel_dep(name = "zstd", version = "1.5.5", repo_name = "llvm_zstd")
 
 # Load a repository for the raw llvm-project, pre-overlay.

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 53 - 71
MODULE.bazel.lock


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů