[bazel] Flip --enable_bzlmod to true (#168555)

Switches to the config added in #164891

Fixes #55924

2 files changed, 15 insertions, 17 deletions

diff --git a/utils/bazel/.bazelrc b/utils/bazel/.bazelrc
index 409c4bd8b633..274609b18e83 100644
--- a/utils/bazel/.bazelrc
+++ b/utils/bazel/.bazelrc
@@ -7,9 +7,7 @@
 # Use sparingly for things common to all compilers and platforms.
 ###############################################################################
 
-# Flip off to disable MODULE.bazel until we're ready.
-# https://github.com/llvm/llvm-project/issues/55924
-common --enable_bzlmod=false --enable_workspace
+common --enable_bzlmod --noenable_workspace
 
 # TODO: Remove lit test reliance on this
 common --legacy_external_runfiles
diff --git a/utils/bazel/MODULE.bazel.lock b/utils/bazel/MODULE.bazel.lock
index 64de258401e9..77c157ee9605 100644
--- a/utils/bazel/MODULE.bazel.lock
+++ b/utils/bazel/MODULE.bazel.lock
@@ -227,10 +227,10 @@
   },
   "selectedYankedVersions": {},
   "moduleExtensions": {
-    "//:extensions.bzl%llvm_deps_extension": {
+    "//:extensions.bzl%llvm_repos_extension": {
       "general": {
-        "bzlTransitiveDigest": "LGeZ4Ibt22AGXloFt/bm3EsBB05m6aTG+WxfH8fJVB4=",
-        "usagesDigest": "dHBLC1g5cqg/flxcuZRJMp2heDoB4+0/NDd6MutLhGE=",
+        "bzlTransitiveDigest": "3NCQtHwwkFzbdvEprZ+u9gQlcf+2PKpoinmAHZTL35o=",
+        "usagesDigest": "X0yUkkWyxQ2Y5oZVDkRSE/K4YkDWo1IjhHsL+1weKyU=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},
@@ -245,7 +245,7 @@
           "llvm_zlib": {
             "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
             "attributes": {
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:zlib-ng.BUILD",
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:zlib-ng.BUILD",
               "sha256": "e36bb346c00472a1f9ff2a0a4643e590a254be6379da7cddd9daeb9a7f296731",
               "strip_prefix": "zlib-ng-2.0.7",
               "urls": [
@@ -256,7 +256,7 @@
           "vulkan_headers": {
             "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
             "attributes": {
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:vulkan_headers.BUILD",
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:vulkan_headers.BUILD",
               "sha256": "19f491784ef0bc73caff877d11c96a48b946b5a1c805079d9006e3fbaa5c1895",
               "strip_prefix": "Vulkan-Headers-9bd3f561bcee3f01d22912de10bb07ce4e23d378",
               "urls": [
@@ -275,7 +275,7 @@
                 "https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz",
                 "https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz"
               ],
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:gmp.BUILD",
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:gmp.BUILD",
               "sha256": "fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2",
               "strip_prefix": "gmp-6.2.1"
             }
@@ -288,7 +288,7 @@
               ],
               "sha256": "826cbb24610bd193f36fde172233fb8c009f3f5c2ad99f644d0dea2e16a20e42",
               "strip_prefix": "mpfr-4.2.2",
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:mpfr.BUILD"
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:mpfr.BUILD"
             }
           },
           "mpc": {
@@ -299,7 +299,7 @@
               ],
               "sha256": "ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8",
               "strip_prefix": "mpc-1.3.1",
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:mpc.BUILD"
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:mpc.BUILD"
             }
           },
           "pfm": {
@@ -310,13 +310,13 @@
               ],
               "sha256": "d18b97764c755528c1051d376e33545d0eb60c6ebf85680436813fa5b04cc3d1",
               "strip_prefix": "libpfm-4.13.0",
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:pfm.BUILD"
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:pfm.BUILD"
             }
           },
           "llvm_zstd": {
             "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
             "attributes": {
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:zstd.BUILD",
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:zstd.BUILD",
               "sha256": "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
               "strip_prefix": "zstd-1.5.2",
               "urls": [
@@ -330,7 +330,7 @@
               "url": "https://github.com/pybind/pybind11/archive/v2.10.3.zip",
               "sha256": "201966a61dc826f1b1879a24a3317a1ec9214a918c8eb035be2f30c3e9cfbdcb",
               "strip_prefix": "pybind11-2.10.3",
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:pybind.BUILD"
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:pybind.BUILD"
             }
           },
           "pyyaml": {
@@ -339,13 +339,13 @@
               "url": "https://github.com/yaml/pyyaml/archive/refs/tags/5.1.zip",
               "sha256": "f0a35d7f282a6d6b1a4f3f3965ef5c124e30ed27a0088efb97c0977268fd671f",
               "strip_prefix": "pyyaml-5.1/lib3",
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:pyyaml.BUILD"
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:pyyaml.BUILD"
             }
           },
           "robin_map": {
             "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
             "attributes": {
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:robin_map.BUILD",
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:robin_map.BUILD",
               "sha256": "a8424ad3b0affd4c57ed26f0f3d8a29604f0e1f2ef2089f497f614b1c94c7236",
               "strip_prefix": "robin-map-1.3.0",
               "url": "https://github.com/Tessil/robin-map/archive/refs/tags/v1.3.0.tar.gz"
@@ -354,7 +354,7 @@
           "nanobind": {
             "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
             "attributes": {
-              "build_file": "@@+llvm_deps_extension+llvm-raw//utils/bazel/third_party_build:nanobind.BUILD",
+              "build_file": "@@+llvm_repos_extension+llvm-raw//utils/bazel/third_party_build:nanobind.BUILD",
               "sha256": "8ce3667dce3e64fc06bfb9b778b6f48731482362fb89a43da156632266cd5a90",
               "strip_prefix": "nanobind-2.9.2",
               "url": "https://github.com/wjakob/nanobind/archive/refs/tags/v2.9.2.tar.gz"