@@ -382,9 +382,12 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
382
382
return flags
383
383
end
384
384
385
- function min_macos_version_flags ()
386
- # Ask compilers to compile for a minimum macOS version, targeting that SDK.
387
- return (" -mmacosx-version-min=\$ {MACOSX_DEPLOYMENT_TARGET}" , " -Wl,-sdk_version,\$ {MACOSX_DEPLOYMENT_TARGET}" )
385
+ # Ask compilers to compile for a minimum macOS version, targeting that SDK.
386
+ function min_macos_version_compiler_flags ()
387
+ return (" -mmacosx-version-min=\$ {MACOSX_DEPLOYMENT_TARGET}" ,)
388
+ end
389
+ function min_macos_version_linker_flags ()
390
+ return (" -Wl,-sdk_version,\$ {MACOSX_DEPLOYMENT_TARGET}" ,)
388
391
end
389
392
390
393
function add_system_includedir (flags:: Vector{String} )
@@ -455,9 +458,8 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
455
458
])
456
459
457
460
if Sys. isapple (p)
458
- macos_version_flags = clang_use_lld ? (min_macos_version_flags ()[1 ],) : min_macos_version_flags ()
459
461
append! (flags, String[
460
- macos_version_flags ... ,
462
+ min_macos_version_compiler_flags () ... ,
461
463
])
462
464
end
463
465
@@ -529,10 +531,14 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
529
531
end
530
532
sanitize_link_flags! (p, flags)
531
533
532
- # On macos, we need to pass `-headerpad_max_install_names` so that we have lots of space
533
- # for `install_name_tool` shenanigans during audit fixups.
534
534
if Sys. isapple (p)
535
+ # On macos, we need to pass `-headerpad_max_install_names` so that we have lots
536
+ # of space for `install_name_tool` shenanigans during audit fixups.
535
537
push! (flags, " -headerpad_max_install_names" )
538
+ if ! clang_use_lld
539
+ # The `-sdk_version` flag is not implemented in lld yet.
540
+ append! (flags, min_macos_version_linker_flags ())
541
+ end
536
542
end
537
543
return flags
538
544
end
@@ -544,7 +550,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
544
550
if gcc_version. major in (4 , 5 )
545
551
push! (flags, " -Wl,-syslibroot,/opt/$(aatriplet (p)) /$(aatriplet (p)) /sys-root" )
546
552
end
547
- append! (flags, min_macos_version_flags ())
553
+ append! (flags, min_macos_version_compiler_flags ())
548
554
return flags
549
555
end
550
556
@@ -617,6 +623,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
617
623
])
618
624
elseif Sys. isapple (p)
619
625
push! (flags, " -headerpad_max_install_names" )
626
+ append! (flags, min_macos_version_linker_flags ())
620
627
elseif Sys. iswindows (p) && gcc_version ≥ v " 5"
621
628
# Do not embed timestamps, for reproducibility:
622
629
# https://github.com/JuliaPackaging/BinaryBuilder.jl/issues/1232
0 commit comments