admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #18309 from Homebrew/linker-flag-parsing

Browse Source 
shims/super/cc: fix linker flag parsing
This commit is contained in:
Mike McQuaid 2024-09-11 17:12:56 +01:00 committed by GitHub
commit 491b9d4fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/shims/super/cc
View File

@ -431,14 +431,16 @@ class Cmd
config.include?("D") config.include?("D")
end end
def linker_flags
@args.select { |arg| arg.start_with?("-Wl,") }
.flat_map { |arg| arg.delete_prefix("-Wl,").split(",") }
end
def no_fixup_chains? def no_fixup_chains?
return false unless config.include?("f") return false unless config.include?("f")
return false unless calls_ld? return false unless calls_ld?
return true if @args.include?("-Wl,-undefined,dynamic_lookup") return true if @args.each_cons(2).include?(["-undefined", "dynamic_lookup"])
return true if linker_flags.each_cons(2).include?(["-undefined", "dynamic_lookup"])
args_consecutive_pairs = @args.each_cons(2)
return true if args_consecutive_pairs.include?(["-undefined", "dynamic_lookup"])
return true if args_consecutive_pairs.include?(["-Wl,-undefined", "-Wl,dynamic_lookup"])
# The next flag would produce an error, but we fix it in `refurbish_arg`. # The next flag would produce an error, but we fix it in `refurbish_arg`.
@args.include?("-undefineddynamic_lookup") @args.include?("-undefineddynamic_lookup")
@ -449,7 +451,10 @@ class Cmd
end end
def ld_classic? def ld_classic?
config.include?("c") && calls_ld? && @args.any? { |arg| arg.match?(/^(-Wl,)?-dead_strip_dylibs$/) } return false unless config.include?("c")
return false unless calls_ld?
@args.include?("-dead_strip_dylibs") || linker_flags.include?("-dead_strip_dylibs")
end end
def calls_ld? def calls_ld?