Merge branch 'master' into tb/llvmbootstrap

Author: giordano

.github/workflows/Documentation.yml

@@ -33,9 +33,9 @@ jobs:
     env:
       JULIA_PKG_SERVER: ""
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: julia-actions/cache@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@v2
         with:
           version: "1.7"
       - uses: julia-actions/julia-docdeploy@releases/v1

.github/workflows/PreviewsCleanup.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout gh-pages branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: gh-pages
       - name: Delete preview and history + push changes

.github/workflows/ci.yml

@@ -86,13 +86,13 @@ jobs:
 
     steps:
       - run: sudo rm -rf /opt/*
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v5
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.julia-version }}
           arch: x64
       # We can't cache artifacts at the moment, it'd require more than 10 GiB.
-      # - uses: julia-actions/cache@v1
+      # - uses: julia-actions/cache@v2
       #   # For the time being cache artifacts only for squashfs, we need too much
       #   # storage for the unpacked shards
       #   if: ${{ matrix.squashfs == true }}

Artifacts.toml

@@ -176,7 +176,7 @@ function __init__()
 
     # Allow the user to override the default value for `storage_dir`
     storage_cache[] = get(ENV, "BINARYBUILDER_STORAGE_DIR",
-                          abspath(joinpath(@__DIR__, "..", "deps")))
+                          @get_scratch!("storage_cache"))
 
     # If the user has signalled that they really want us to automatically
     # accept apple EULAs, do that.

deps/.gitignore

@@ -587,7 +587,7 @@ function choose_shards(p::AbstractPlatform;
             compilers::Vector{Symbol} = [:c],
             # We always just use the latest Rootfs embedded within our Artifacts.toml
             rootfs_build::VersionNumber=last(BinaryBuilderBase.get_available_builds("Rootfs")),
-            ps_build::VersionNumber=v"2025.02.15",
+            ps_build::VersionNumber=v"2025.08.13",
             GCC_builds::Vector{GCCBuild}=available_gcc_builds,
             LLVM_builds::Vector{LLVMBuild}=available_llvm_builds,
             Rust_builds::Vector{RustBuild}=available_rust_builds,

src/BinaryBuilderBase.jl

@@ -440,9 +440,13 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
         # build-id is not supported on macOS compilers
         if !Sys.isapple(p)
             # Windows build-id requires binutils 2.25+, which we only have for GCC 5+
-            if !Sys.iswindows(p) || (Sys.iswindows(p) && gcc_version ≥ v"5")
+            if !Sys.iswindows(p) || (Sys.iswindows(p) && gcc_version ≥ v"5" && !clang_use_lld)
                 # Use a known algorithm to embed the build-id for reproducibility
                 push!(flags, "-Wl,--build-id=sha1")
+            elseif Sys.iswindows(p) && clang_use_lld
+                # This is reproducible as we set `-Wl,--no-insert-timestamp` elsewhere
+                # See https://github.com/llvm/llvm-project/issues/74238#issuecomment-1839640836
+                push!(flags, "-Wl,--build-id")
             end
         end
     end
@@ -550,6 +554,10 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
                 # The `-sdk_version` flag is not implemented in lld yet.
                 append!(flags, min_macos_version_linker_flags())
             end
+        elseif Sys.iswindows(p) && gcc_version ≥ v"5"
+            # Do not embed timestamps, for reproducibility:
+            # https://github.com/JuliaPackaging/BinaryBuilder.jl/issues/1232
+            push!(flags, "-Wl,--no-insert-timestamp")
         end
 
         buildid_link_flags!(p, flags)
@@ -1573,7 +1581,10 @@ function runner_setup!(workspaces, mappings, workspace_root, verbose, kwargs, pl
         if !isdir(ccache_dir())
             mkpath(ccache_dir())
         end
-        push!(workspaces, ccache_dir() => envs["CCACHE_DIR"])
+        if haskey(envs, "CCACHE_DIR")
+            # When bootstrapping, `CCACHE_DIR` is not defined.
+            push!(workspaces, ccache_dir() => envs["CCACHE_DIR"])
+        end
     end
 
     return platform, envs, shards

src/Rootfs.jl

@@ -160,9 +160,9 @@ end
 
     # Checks that the compiler/linker include a build-id
     # This is only available on ELF-based platforms
-    @testset "Compilation - Linux build-id note $(platform) - $(compiler)" for platform in elf_platforms, compiler in ("cc", "gcc", "clang", "c++", "g++", "clang++")
+    @testset "Compilation - Linux build-id note $(platform) - $(compiler) - clang_use_lld=$(clang_use_lld)" for platform in elf_platforms, compiler in ("cc", "gcc", "clang", "c++", "g++", "clang++"), clang_use_lld in (true, false)
         mktempdir() do dir
-            ur = preferred_runner()(dir; platform=platform)
+            ur = preferred_runner()(dir; platform=platform, clang_use_lld=clang_use_lld)
             iobuff = IOBuffer()
             test_c = """
                 #include <stdlib.h>
@@ -196,10 +196,10 @@ end
     end
 
     # Checks that Windows can include a build-id
-    @testset "Compilation - Windows build-id note $(platform) - $(compiler)" for platform in win_platforms, compiler in ("cc", "gcc", "clang", "c++", "g++", "clang++")
+    @testset "Compilation - Windows build-id note $(platform) - $(compiler) - clang_use_lld=$(clang_use_lld)" for platform in win_platforms, compiler in ("cc", "gcc", "clang", "c++", "g++", "clang++"), clang_use_lld in (true, false)
         mktempdir() do dir
             # Windows build-id support requires binutils 2.25, which is part of our GCC 5
-            ur = preferred_runner()(dir; platform=platform, preferred_gcc_version=v"5")
+            ur = preferred_runner()(dir; platform=platform, preferred_gcc_version=v"5", clang_use_lld=clang_use_lld)
             iobuff = IOBuffer()
             test_c = """
                 #include <stdlib.h>