[Runner] Make clang_use_lld a keyword argument (#357)

Author: giordano

Project.toml

@@ -1,7 +1,7 @@
 name = "BinaryBuilderBase"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
 authors = ["Elliot Saba <staticfloat@gmail.com>"]
-version = "1.28.0"
+version = "1.29.0"
 
 [deps]
 Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"

src/Runner.jl

@@ -1344,7 +1344,14 @@ function runner_setup!(workspaces, mappings, workspace_root, verbose, kwargs, pl
 
     clang = filter(s -> s.name == "LLVMBootstrap", shards)
     clang_version = length(clang) == 1 ? only(clang).version : nothing
-    clang_use_lld = (!isnothing(gcc_version) && !isnothing(clang_version) && clang_version >= v"16" && gcc_version >= v"6")
+    clang_use_lld = let
+        kw = collect(extract_kwargs(kwargs, (:clang_use_lld,)))
+        # Default `clang_use_lld` to `true` if not specified.
+        value = isone(length(kw)) ? last(only(kw)) : true
+        # The user can ask for using `lld` as linker with Clang, but we can
+        # actually use it only under certain conditions.
+        value && (!isnothing(gcc_version) && !isnothing(clang_version) && clang_version >= v"16" && gcc_version >= v"6")
+    end
     # Construct environment variables we'll use from here on out
     platform::Platform = get_concrete_platform(platform; compilers..., extract_kwargs(kwargs, (:preferred_gcc_version,:preferred_llvm_version))...)
     envs::Dict{String,String} = merge(platform_envs(platform, src_name; rust_version, verbose, compilers...), extra_env)

test/runners.jl

@@ -487,6 +487,20 @@ end
             seekstart(iobuff)
             @test occursin(r"lld", readchomp(iobuff))
         end
+
+        mktempdir() do dir
+            platform = Platform("x86_64", "linux", libc="musl")
+            ur = preferred_runner()(dir; platform, preferred_gcc_version=v"9", clang_use_lld=false)
+            iobuff = IOBuffer()
+            test_script = raw"""
+                cat $(which clang)
+                """
+            cmd = `/bin/bash -c "$(test_script)"`
+            @test run(ur, cmd, iobuff)
+            seekstart(iobuff)
+            @test occursin("-fuse-ld=$(aatriplet(platform))", readchomp(iobuff))
+        end
+
     end