macOS targeting fixes

Author: staticfloat

BinaryBuilderAuditor.jl/src/SystemLibraries.jl

@@ -110,6 +110,7 @@ function is_system_library(soname::AbstractString, platform::AbstractPlatform)
         ]
         csl_libs = [
             "libgcc_s.1.dylib",
+            "libgcc_s.1.1.dylib",
         ]
         return lowercase(soname) ∈ vcat(ignore_libs, csl_libs)
     elseif os(platform) == "windows"

BinaryBuilderAuditor.jl/src/passes/DynamicLinkage.jl

@@ -8,7 +8,7 @@ function resolve_dynamic_links!(scan::ScanResult,
     dep_soname_map = Dict{String,Tuple{Symbol,Symbol}}()
     for (jll_name, libs) in dep_libs
         for lib in libs
-            dep_soname_map[lib.soname] = (Symbol(string(jll_name, "_jll")), lib.varname)
+            dep_soname_map[basename(lib.soname)] = (Symbol(string(jll_name, "_jll")), lib.varname)
         end
     end
 
@@ -147,7 +147,7 @@ function rpaths_consistent!(scan::ScanResult,
     soname_locator = copy(scan.soname_locator)
     for (_, libs) in dep_libs
         for lib in libs
-            soname_locator[lib.soname] = lib.path
+            soname_locator[basename(lib.soname)] = lib.path
         end
     end
 

BinaryBuilderToolchains.jl/src/toolchains/CToolchain.jl

@@ -691,8 +691,7 @@ function toolchain_env(toolchain::CToolchain, deployed_prefix::String)
         set_envvars(env_prefix, wrapper_prefix)
     end
 
-    sdk_jll = get_jll(toolchain, "macOSSDK_jll")
-    if sdk_jll !== nothing
+    if Sys.isapple(toolchain.platform.target)
         # If toolchain platform already has an `os_version`, we need to obey that, otherwise we
         # use the default deployment targets for the architecture being built:
         function default_kernel_version(arch)
@@ -1029,7 +1028,7 @@ function clang_wrappers(toolchain::CToolchain, dir::String)
         if is_clangxx
             # It's extremely rare, but some packages (such as `libc++` itself) manually set
             # the `--stdlib` flag, so let's let them do their thing.
-            flagmatch(io, [!flag"--stdlib", !flag"--nostdlib++"]) do io
+            flagmatch(io, [!flag"--stdlib=.*"r, !flag"--nostdlib++"]) do io
                 append_flags(io, :PRE, [
                     # Set the C++ runtime library, but only in clang++
                     "--stdlib=$(get_cxx_runtime_str(toolchain))",
@@ -1155,12 +1154,12 @@ function binutils_wrappers(toolchain::CToolchain, dir::String)
 
     # Many of our tools have nondeterministic
     function _warn_nondeterministic_definition(io, nondeterminism_description="uses flags that cause nondeterministic output!")
-        println(io, raw"""
+        println(io, """
         NONDETERMINISTIC=0
         warn_nondeterministic() {
-            if [[ "${NONDETERMINISTIC}" != "1" ]]; then
-                echo "Non-reproducibility alert: This '$0' invocation $(nondeterminism_description)." >&2
-                echo "$0 flags: ${ARGS[@]}" >&2
+            if [[ "\${NONDETERMINISTIC}" != "1" ]]; then
+                echo "Non-reproducibility alert: This '\$0' invocation $(nondeterminism_description)." >&2
+                echo "\$0 flags: \${ARGS[@]}" >&2
                 echo "Continuing build, but please repent." >&2
             fi
             NONDETERMINISTIC=1

src/build_api/PackageConfig.jl

@@ -263,9 +263,11 @@ function add_os_version(platform::Platform, target_spec::BuildTargetSpec)
         end
 
         tenv = toolchain_env(toolchain, "")
-        # Get the version that the JLL corresponds to, and return!
-        platform["os_version"] = string(version_map(tenv["MACOSX_DEPLOYMENT_TARGET"]))
-        return platform
+        if haskey(tenv, "MACOSX_DEPLOYMENT_TARGET")
+            # Get the version that the JLL corresponds to, and return!
+            platform["os_version"] = string(version_map(tenv["MACOSX_DEPLOYMENT_TARGET"]))
+            return platform
+        end
     end
 
     # Unable to find an OS version, that's fine!