From 927ae26fad47289ae84de0cb23f0395ca7a79610 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Thu, 29 Apr 2021 00:01:00 -0700
Subject: [PATCH] externalToLink: use quoteShell to avoid issues with spaces in
 paths for {.link.} pragmas (#17875)

---
 compiler/extccomp.nim | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index 3b415c499e..1cea9edebe 100644
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -943,6 +943,7 @@ proc jsonBuildInstructionsFile*(conf: ConfigRef): AbsoluteFile =
   result = getNimcacheDir(conf) / conf.outFile.changeFileExt("json")
 
 proc writeJsonBuildInstructions*(conf: ConfigRef) =
+  # xxx use std/json instead, will result in simpler, more maintainable code.
   template lit(x: string) = f.write x
   template str(x: string) =
     buf.setLen 0
@@ -964,23 +965,18 @@ proc writeJsonBuildInstructions*(conf: ConfigRef) =
   proc linkfiles(conf: ConfigRef; f: File; buf, objfiles: var string; clist: CfileList;
                  llist: seq[string]) =
     var pastStart = false
+    template impl(path) =
+      let path2 = quoteShell(path)
+      objfiles.add(' ')
+      objfiles.add(path2)
+      if pastStart: lit ",\L"
+      str path2
+      pastStart = true
     for it in llist:
-      let objfile = if noAbsolutePaths(conf): it.extractFilename
-                    else: it
-      let objstr = addFileExt(objfile, CC[conf.cCompiler].objExt)
-      objfiles.add(' ')
-      objfiles.add(objstr)
-      if pastStart: lit ",\L"
-      str objstr
-      pastStart = true
-
+      let objfile = if noAbsolutePaths(conf): it.extractFilename else: it
+      impl(addFileExt(objfile, CC[conf.cCompiler].objExt))
     for it in clist:
-      let objstr = quoteShell(it.obj)
-      objfiles.add(' ')
-      objfiles.add(objstr)
-      if pastStart: lit ",\L"
-      str objstr
-      pastStart = true
+      impl(it.obj)
     lit "\L"
 
   proc depfiles(conf: ConfigRef; f: File; buf: var string) =