Reduce needless code duplication

Author: giordano

src/auditor/dynamic_linkage.jl

@@ -450,7 +450,7 @@ function update_linkage(prefix::Prefix, platform::AbstractPlatform, path::Abstra
         return
     end
 
-    # macOS uses install_name_tool (check first since Sys.isbsd is true for macOS too)
+    # macOS uses install_name_tool
     if Sys.isapple(platform)
         return _update_linkage_macho(prefix, platform, path, old_libpath, new_libpath; verbose, subdir)
     end

src/auditor/soname_matching.jl

@@ -47,19 +47,6 @@ function ensure_soname(prefix::Prefix, path::AbstractString, platform::AbstractP
         return true
     end
 
-    # macOS uses install_name_tool (check first since Sys.isbsd is true for macOS too)
-    if Sys.isapple(platform)
-        return _ensure_soname_macho(prefix, path, platform; verbose, autofix, subdir)
-    end
-
-    # For Linux/FreeBSD, wrap the entire read-modify-verify cycle in the file lock
-    return with_patchelf_lock(path) do
-        _ensure_soname_elf(prefix, path, platform; verbose, autofix, subdir)
-    end
-end
-
-function _ensure_soname_macho(prefix::Prefix, path::AbstractString, platform::AbstractPlatform;
-                              verbose::Bool = false, autofix::Bool = false, subdir::AbstractString="")
     # Skip if this file already contains an SONAME
     rel_path = relpath(realpath(path), realpath(prefix.path))
     soname = get_soname(path)
@@ -78,55 +65,19 @@ function _ensure_soname_macho(prefix::Prefix, path::AbstractString, platform::Ab
     end
 
     # Otherwise, set the SONAME
+    # Create a new linkage that looks like @rpath/$lib on OSX
     retval = with_logfile(prefix, "set_soname_$(basename(rel_path))_$(soname).log"; subdir) do io
-        ur = preferred_runner()(prefix.path; cwd="/workspace/", platform=platform)
-        install_name_tool = "/opt/bin/$(triplet(ur.platform))/install_name_tool"
-        set_soname_cmd = `$install_name_tool -id $(soname) $(rel_path)`
-        @lock AUDITOR_SANDBOX_LOCK run(ur, set_soname_cmd, io; verbose=verbose)
-    end
-
-    if !retval
-        @lock AUDITOR_LOGGING_LOCK @warn("Unable to set SONAME on $(rel_path)")
-        return false
-    end
-
-    # Read the SONAME back in and ensure it's set properly
-    new_soname = get_soname(path)
-    if new_soname != soname
-        @lock AUDITOR_LOGGING_LOCK @warn("Set SONAME on $(rel_path) to $(soname), but read back $(string(new_soname))!")
-        return false
-    end
-
-    if verbose
-        @lock AUDITOR_LOGGING_LOCK @info("Set SONAME of $(rel_path) to \"$(soname)\"")
-    end
-
-    return true
-end
-
-# This function is called with the patchelf lock already held
-function _ensure_soname_elf(prefix::Prefix, path::AbstractString, platform::AbstractPlatform;
-                            verbose::Bool = false, autofix::Bool = false, subdir::AbstractString="")
-    # Skip if this file already contains an SONAME
-    rel_path = relpath(realpath(path), realpath(prefix.path))
-    soname = get_soname(path)
-    if soname != nothing
-        if verbose
-            @lock AUDITOR_LOGGING_LOCK @info("$(rel_path) already has SONAME \"$(soname)\"")
+        if Sys.isapple(platform)
+            ur = preferred_runner()(prefix.path; cwd="/workspace/", platform=platform)
+            install_name_tool = "/opt/bin/$(triplet(ur.platform))/install_name_tool"
+            set_soname_cmd = `$install_name_tool -id $(soname) $(rel_path)`
+            @lock AUDITOR_SANDBOX_LOCK run(ur, set_soname_cmd, io; verbose=verbose)
+        else
+            # For Linux/FreeBSD, wrap the entire read-modify-verify cycle in the file lock
+            with_patchelf_lock(path) do
+                success(run_with_io(io, `$(patchelf()) $(patchelf_flags(platform)) --set-soname $(soname) $(realpath(path))`; wait=false))
+            end
         end
-        return true
-    else
-        soname = basename(path)
-    end
-
-    # If we're not allowed to fix it, fail out
-    if !autofix
-        return false
-    end
-
-    # Otherwise, set the SONAME
-    retval = with_logfile(prefix, "set_soname_$(basename(rel_path))_$(soname).log"; subdir) do io
-        success(run_with_io(io, `$(patchelf()) $(patchelf_flags(platform)) --set-soname $(soname) $(realpath(path))`; wait=false))
     end
 
     if !retval