Fix macOS tests

Also aid in debugging when JLLs fail to deploy

Author: staticfloat

BinaryBuilderSources.jl/src/JLLSource.jl

@@ -206,7 +206,12 @@ function deploy(jlls::Vector{JLLSource}, prefix::String)
         install_path = joinpath(prefix, target)
         mkpath(install_path)
         paths = unique(vcat((jll.artifact_paths for jll in target_jlls)...))
-        deploy_artifact_paths(install_path, unique(vcat((jll.artifact_paths for jll in target_jlls)...)))
+        try
+            deploy_artifact_paths(install_path, paths)
+        catch
+            @error("Failed to deploy", install_path, paths)
+            rethrow()
+        end
     end
 end
 

BinaryBuilderToolchains.jl/src/toolchains/CToolchain.jl

@@ -582,7 +582,12 @@ function jll_source_selection(vendor::Symbol, platform::CrossPlatform,
             append!(deps, libstdcxx_libs)
         end
         if cxx_runtime == :libcxx
-           append!(deps, libcxx_libs)
+            # We don't add these on macOS because the SDK actually comes with these libraries available.
+            # We still build them for completeness, and in the event that we actually want to use newer
+            # libraries, although I'm not sure why we would want that.
+            if os(platform.target) != "macos"
+                append!(deps, libcxx_libs)
+            end
         end
     else
         throw(ArgumentError("Invalid vendor '$(vendor)'!"))

BinaryBuilderToolchains.jl/test/CToolchainTests.jl

@@ -157,6 +157,10 @@ ENV["TESTSUITE_OUTPUT_DIR"] = mktempdir(;cleanup=false)
                     @testset "make compile-all" begin
                         cd(joinpath(@__DIR__, "testsuite", "CToolchain")) do
                             EXCLUDED_DIRS = String[]
+                            # macOS doesn't do debug sections, so there's no compressing them.
+                            if Sys.isapple(target)
+                                push!(EXCLUDED_DIRS, "07_compressed_debug_sections")
+                            end
                             # the bootstrap GCC binutils doesn't have our deterministic strip patch
                             if Sys.iswindows(target) && vendor == :gcc_bootstrap
                                 push!(EXCLUDED_DIRS, "08_strip_resigning")