Change with_toolchains() to auto-provide c++ stdlibs

Because our toolchains require a pretty recent `libstdc++` (and
`libc++`, in some cases!) we provide these libraries on the
`LD_LIBRARY_PATH` automatically with the `with_toolchains()` function.

Author: staticfloat

BinaryBuilderAuditor.jl/Project.toml

@@ -24,8 +24,9 @@ julia = "1.6"
 [extras]
 BinaryBuilderToolchains = "33566f4c-336c-3150-6d30-4374274e6143"
 JLLPrefixes = "afc68a34-7891-4c5a-9da1-1c62935e7b0d"
+LazyJLLWrappers = "21706172-204c-4d4f-5420-656854206f44"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TreeArchival = "216c6a2e-6c61-7669-6863-726165657274"
 
 [targets]
-test = ["BinaryBuilderToolchains", "JLLPrefixes", "Test", "TreeArchival"]
+test = ["BinaryBuilderToolchains", "JLLPrefixes", "LazyJLLWrappers", "Test", "TreeArchival"]

BinaryBuilderAuditor.jl/test/passes/DynamicLinkageTests.jl

@@ -174,4 +174,4 @@ for target_platform in (Platform("x86_64", "linux"), Platform("aarch64", "macos"
             end
         end
     end
-end
+end

BinaryBuilderAuditor.jl/test/runtests.jl

@@ -6,7 +6,6 @@ include("passes/LicenseTests.jl")
 include("passes/LibrarySONAMETests.jl")
 include("passes/DynamicLinkageTests.jl")
 
-
 @testset "audit!" begin
     platform = CrossPlatform(BBHostPlatform() => HostPlatform())
     toolchain = CToolchain(platform; use_ccache=false)

BinaryBuilderToolchains.jl/Project.toml

@@ -9,6 +9,7 @@ BinaryBuilderPlatformExtensions = "213f2928-4d72-6f46-7461-4c705f634367"
 BinaryBuilderSources = "316c416d-4527-6863-7465-466137743047"
 HistoricalStdlibVersions = "6df8b67a-e8a0-4029-b4b7-ac196fe72102"
 JLLPrefixes = "afc68a34-7891-4c5a-9da1-1c62935e7b0d"
+LazyJLLWrappers = "21706172-204c-4d4f-5420-656854206f44"
 NetworkOptions = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
@@ -27,8 +28,8 @@ Scratch = "1.2"
 julia = "1.9"
 
 [extras]
-LazyJLLWrappers = "21706172-204c-4d4f-5420-656854206f44"
+
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["LazyJLLWrappers", "Test"]
+test = ["Test"]

BinaryBuilderToolchains.jl/src/BinaryBuilderToolchains.jl

@@ -62,8 +62,8 @@ include("InteractiveUtils.jl")
                     CToolchain(platform),
                     HostToolsToolchain(platform)
                 ])
-            catch
-                @warn("Failed to precompile support for platform", platform)
+            catch e
+                @warn("Failed to precompile support for platform", platform, e)
             end
         end
     end

BinaryBuilderToolchains.jl/src/InteractiveUtils.jl

@@ -1,4 +1,4 @@
-using Scratch
+using Scratch, LazyJLLWrappers
 
 export with_toolchains, runshell
 
@@ -56,6 +56,51 @@ function path_appending_merge(env, others...; appending_keys::Set{String}=defaul
     return env
 end
 
+function with_cxx_csls(f::Function, env)
+    cxx_csl_libs = [
+        JLLSource(
+            "libstdcxx_jll",
+            BBHostPlatform();
+            uuid=Base.UUID("3ba1ab17-c18f-5d2d-9d5a-db37f286de95"),
+            repo=Pkg.Types.GitRepo(
+                rev="main",
+                source="https://github.com/staticfloat/libstdcxx_jll.jl",
+            ),
+        ),
+        JLLSource(
+            "LLVMLibcxx_jll",
+            BBHostPlatform();
+            uuid=Base.UUID("899a7460-a157-599b-96c7-ccb58ef9beb5"),
+            repo=Pkg.Types.GitRepo(
+                rev="main",
+                source="https://github.com/staticfloat/LLVMLibcxx_jll.jl",
+            ),
+        ),
+        JLLSource(
+            "LLVMLibunwind_jll",
+            BBHostPlatform();
+            uuid=Base.UUID("871c935c-5660-55ad-bb68-d1283357316b"),
+            repo=Pkg.Types.GitRepo(
+                rev="main",
+                source="https://github.com/staticfloat/LLVMLibunwind_jll.jl",
+            ),
+        ),
+    ]
+    mktempdir() do prefix
+        prepare(cxx_csl_libs)
+        deploy(cxx_csl_libs, prefix)
+        libpath = string(
+            joinpath(prefix, "lib"),
+            LazyJLLWrappers.pathsep,
+            joinpath(prefix, triplet(BBHostPlatform()), "lib"),
+            LazyJLLWrappers.pathsep,
+            joinpath(prefix, triplet(BBHostPlatform()), "lib64"),
+        )
+        env = LazyJLLWrappers.adjust_ENV!(env, "", libpath, false, true)
+        f(env)
+    end
+end
+
 
 """
     with_toolchains(f::Function, toolchains::Vector{AbstractToolchain};
@@ -84,9 +129,11 @@ function with_toolchains(f::Function, toolchains::Vector{<:AbstractToolchain};
                          deploy_dir::Union{Nothing,String} = nothing,
                          env = ENV,
                          verbose::Bool = false)
+    # Collect the sources from the toolchains
+    srcs = reduce(vcat, toolchain_sources.(toolchains))
+
     # Prepare all sources.  We do this in one `prepare()` invocation, as
     # there can be efficiency benefits, especially when `deploy()`'ing later.
-    srcs = reduce(vcat, toolchain_sources.(toolchains))
     prepare(srcs; verbose)
 
     function deploy_and_run(prefix)
@@ -98,7 +145,9 @@ function with_toolchains(f::Function, toolchains::Vector{<:AbstractToolchain};
             toolchain_env.(toolchains, (prefix,))...,
             filter_env_vars(env),
         ])
-        f(prefix, env)
+        with_cxx_csls(env) do env
+            f(prefix, env)
+        end
     end
 
     # If no `deploy_dir` was given, generate a temporary one that exists only

BinaryBuilderToolchains.jl/test/CToolchainTestJLLs.jl

@@ -35,13 +35,8 @@ ENV["TESTSUITE_OUTPUT_DIR"] = mktempdir(;cleanup=false)
             @info("CToolchain tests", use_ccache, config...)
             with_toolchains([toolchain, htt_toolchain]) do prefix, env
                 env["CCACHE_DIR"] = ccache_dir
-                # We build with _all_ of the C++ stdlib choices here, so we need to ensure that
-                # we have the appropriate libraries on our `LD_LIBRARY_PATH` for testing, so
-                # that we can properly attempt to run them.
-                with_cxx_csls(;env) do env
-                    toolchain_tests(prefix, env, platform, "CToolchain";
-                                    do_cxxabi_tests=config[:cxx_runtime] == :libstdcxx)
-                end
+                toolchain_tests(prefix, env, platform, "CToolchain";
+                                do_cxxabi_tests=config[:cxx_runtime] == :libstdcxx)
             end
         end
     end

BinaryBuilderToolchains.jl/test/CToolchainTests.jl

@@ -12,7 +12,6 @@ end
 include("common.jl")
 include("PkgUtilsTests.jl")
 include("WrapperUtilsTests.jl")
-include("CToolchainTestJLLs.jl")
 include("CToolchainTests.jl")
 include("HostToolsToolchainTests.jl")
 include("CMakeToolchainTests.jl")