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

Fix long link commands on macOS (v2) (#21382)

Browse source 
Handle long link commands on macOS with a script, since ar does not support response files
This commit is contained in:
Matt Haggard 2023-02-17 05:25:15 -05:00 • committed by GitHub
commit 6b93db7070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/extccomp.nim
View file

@ -834,6 +834,15 @@ proc linkViaResponseFile(conf: ConfigRef; cmd: string) =
finally: finally:
removeFile(linkerArgs) removeFile(linkerArgs)
proc linkViaShellScript(conf: ConfigRef; cmd: string) =
let linkerScript = conf.projectName & "_" & "linkerScript.sh"
writeFile(linkerScript, cmd)
let shell = getEnv("SHELL")
try:
execLinkCmd(conf, shell & " " & linkerScript)
finally:
removeFile(linkerScript)
proc getObjFilePath(conf: ConfigRef, f: Cfile): string = proc getObjFilePath(conf: ConfigRef, f: Cfile): string =
if noAbsolutePaths(conf): f.obj.extractFilename if noAbsolutePaths(conf): f.obj.extractFilename
else: f.obj.string else: f.obj.string
@ -856,9 +865,12 @@ proc preventLinkCmdMaxCmdLen(conf: ConfigRef, linkCmd: string) =
# Windows's command line limit is about 8K (8191 characters) so C compilers on # Windows's command line limit is about 8K (8191 characters) so C compilers on
# Windows support a feature where the command line can be passed via ``@linkcmd`` # Windows support a feature where the command line can be passed via ``@linkcmd``
# to them. # to them.
const MaxCmdLen = when defined(windows): 8_000 else: 32_000 const MaxCmdLen = when defined(windows): 8_000 elif defined(macosx): 260_000 else: 32_000
if linkCmd.len > MaxCmdLen: if linkCmd.len > MaxCmdLen:
linkViaResponseFile(conf, linkCmd) when defined(macosx):
linkViaShellScript(conf, linkCmd)
else:
linkViaResponseFile(conf, linkCmd)
else: else:
execLinkCmd(conf, linkCmd) execLinkCmd(conf, linkCmd)