jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #14132 dsymutil should not be called on static libraries (#14133) [backport:1.2]

Browse source
This commit is contained in:
Timothee Cour 2020-04-27 03:39:27 -07:00 • committed by GitHub
commit b8d7a98265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/extccomp.nim
View file

@ -850,12 +850,12 @@ proc execLinkCmd(conf: ConfigRef; linkCmd: string) =
proc maybeRunDsymutil(conf: ConfigRef; exe: AbsoluteFile) = proc maybeRunDsymutil(conf: ConfigRef; exe: AbsoluteFile) =
when defined(osx): when defined(osx):
if optCDebug notin conf.globalOptions: return if optCDebug in conf.globalOptions and optGenStaticLib notin conf.globalOptions:
# if needed, add an option to skip or override location # if needed, add an option to skip or override location
let cmd = "dsymutil " & $(exe).quoteShell let cmd = "dsymutil " & $(exe).quoteShell
conf.extraCmds.add cmd conf.extraCmds.add cmd
tryExceptOSErrorMessage(conf, "invocation of dsymutil failed."): tryExceptOSErrorMessage(conf, "invocation of dsymutil failed."):
execExternalProgram(conf, cmd, hintExecuting) execExternalProgram(conf, cmd, hintExecuting)
proc execCmdsInParallel(conf: ConfigRef; cmds: seq[string]; prettyCb: proc (idx: int)) = proc execCmdsInParallel(conf: ConfigRef; cmds: seq[string]; prettyCb: proc (idx: int)) =
let runCb = proc (idx: int, p: Process) = let runCb = proc (idx: int, p: Process) =