| ... | @@ -960,12 +960,6 @@ fn detectAbiAndDynamicLinker(io: Io, cpu: Target.Cpu, os: Target.Os, query: Targ | ... | @@ -960,12 +960,6 @@ fn detectAbiAndDynamicLinker(io: Io, cpu: Target.Cpu, os: Target.Os, query: Targ |
| 960 | if (!native_target_has_ld or have_all_info or os_is_non_native or is_illumos or is_darwin) { | 960 | if (!native_target_has_ld or have_all_info or os_is_non_native or is_illumos or is_darwin) { |
| 961 | return defaultAbiAndDynamicLinker(cpu, os, query); | 961 | return defaultAbiAndDynamicLinker(cpu, os, query); |
| 962 | } | 962 | } |
| 963 | if (query.abi) |abi| { | | |
| 964 | if (abi.isMusl()) { | | |
| 965 | // musl implies static linking. | | |
| 966 | return defaultAbiAndDynamicLinker(cpu, os, query); | | |
| 967 | } | | |
| 968 | } | | |
| 969 | // The current target's ABI cannot be relied on for this. For example, we may build the zig | 963 | // The current target's ABI cannot be relied on for this. For example, we may build the zig |
| 970 | // compiler for target riscv64-linux-musl and provide a tarball for users to download. | 964 | // compiler for target riscv64-linux-musl and provide a tarball for users to download. |
| 971 | // A user could then run that zig compiler on riscv64-linux-gnu. This use case is well-defined | 965 | // A user could then run that zig compiler on riscv64-linux-gnu. This use case is well-defined |