diff --git a/MODULE.bazel b/MODULE.bazel index e00ce24..a5f9d5f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -36,6 +36,7 @@ archive_override( integrity = "sha256-sSr0NUsY06DQwPoxgh+drMpOkeG/N7Lx+KxWkZTFUDM=", patch_strip = 1, patches = [ + "//nodejs/private/patches/llvm:macos-sdk-26.5.patch", "//nodejs/private/patches/llvm:msvc-cxx-standard.patch", "//nodejs/private/patches/llvm:msvc-module-map.patch", "//nodejs/private/patches/llvm:msvc-vfs-overlay.patch", diff --git a/nodejs/private/patches/llvm/BUILD.bazel b/nodejs/private/patches/llvm/BUILD.bazel index 4d7a6f7..d518110 100644 --- a/nodejs/private/patches/llvm/BUILD.bazel +++ b/nodejs/private/patches/llvm/BUILD.bazel @@ -1,7 +1 @@ -exports_files([ - "msvc-cxx-standard.patch", - "msvc-module-map.patch", - "msvc-vfs-overlay.patch", - "msvc-runtime-features.patch", - "msvc-warning-level.patch", -]) +exports_files(glob(["*.patch"])) diff --git a/nodejs/private/patches/llvm/macos-sdk-26.5.patch b/nodejs/private/patches/llvm/macos-sdk-26.5.patch new file mode 100644 index 0000000..ce38141 --- /dev/null +++ b/nodejs/private/patches/llvm/macos-sdk-26.5.patch @@ -0,0 +1,21 @@ +# Backport of https://github.com/hermeticbuild/hermetic-llvm/pull/710 + +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -135,12 +135,12 @@ use_repo(mingw, "mingw") + + osx = use_extension("//extensions:osx.bzl", "osx") + osx.from_archive( +- sha256 = "edc7ce9b8f09e0c7a39aaa714f941b4c2597f333ec1ffe59a14d67eb36cdb7e7", +- strip_prefix = "Payload/Library/Developer/CommandLineTools/SDKs/MacOSX26.4.sdk", ++ sha256 = "5f044578cd78a3a9b9c965a42d56bad609ee5d252e1d4e6aa7c42fc3f35fee7b", ++ strip_prefix = "Payload/Library/Developer/CommandLineTools/SDKs/MacOSX26.5.sdk", + type = "pkg", + urls = [ +- "https://swcdn.apple.com/content/downloads/60/13/122-35686-A_30JUXWIJFR/ck0gzuw5qccefzm3ptlwou3pu6a55d0o02/CLTools_macOSNMOS_SDK.pkg", +- "https://web.archive.org/web/20260430051604/https://swcdn.apple.com/content/downloads/60/13/122-35686-A_30JUXWIJFR/ck0gzuw5qccefzm3ptlwou3pu6a55d0o02/CLTools_macOSNMOS_SDK.pkg", ++ "https://swcdn.apple.com/content/downloads/09/08/047-91568-A_Y1CFZWQCD4/4xekpyz43i26dbp4enxfro8eb1q7wiujh5/CLTools_macOSNMOS_SDK.pkg", ++ "https://web.archive.org/web/20260512015547id_/https://swcdn.apple.com/content/downloads/09/08/047-91568-A_Y1CFZWQCD4/4xekpyz43i26dbp4enxfro8eb1q7wiujh5/CLTools_macOSNMOS_SDK.pkg", + ], + ) + use_repo(osx, "macos_sdk") diff --git a/tests/integration/.bazelversion b/tests/integration/.bazelversion new file mode 100644 index 0000000..44931da --- /dev/null +++ b/tests/integration/.bazelversion @@ -0,0 +1 @@ +9.1.1