Merge branch 'devel' into another-channel-fix

2 files changed, 5 insertions, 10 deletions

diff --git a/config/nim.cfg b/config/nim.cfg
index 48ab0d7bd..a5c9eeccd 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -100,7 +100,7 @@ path="$lib/pure"
 @if windows:
   #gcc.path = r"$nim\dist\mingw\bin"
   @if gcc:
-    #tlsEmulation:on
+    tlsEmulation:on
   @end
 @end
 
@@ -110,13 +110,7 @@ path="$lib/pure"
   gcc.options.always = "-w"
   gcc.cpp.options.always = "-w -fpermissive"
 @else:
-  @if cpu32:
-    gcc.options.always = "-w -m32"
-    gcc.options.linker = "-m32"
-  @else:
-    gcc.options.always = "-w -m64"
-    gcc.options.linker = "-m64"
-  @end
+  gcc.options.always = "-w"
   gcc.cpp.options.always = "-w -fpermissive"
 @end
 
diff --git a/tools/nimweb.nim b/tools/nimweb.nim
index 9a21a0fb5..2c905057e 100644
--- a/tools/nimweb.nim
+++ b/tools/nimweb.nim
@@ -322,11 +322,12 @@ proc buildPdfDoc(c: var TConfigData, destPath: string) =
   if os.execShellCmd("pdflatex -version") != 0:
     echo "pdflatex not found; no PDF documentation generated"
   else:
+    const pdflatexcmd = "pdflatex -interaction=nonstopmode "
     for d in items(c.pdf):
       exec(findNim() & " rst2tex $# $#" % [c.nimArgs, d])
       # call LaTeX twice to get cross references right:
-      exec("pdflatex " & changeFileExt(d, "tex"))
-      exec("pdflatex " & changeFileExt(d, "tex"))
+      exec(pdflatexcmd & changeFileExt(d, "tex"))
+      exec(pdflatexcmd & changeFileExt(d, "tex"))
       # delete all the crappy temporary files:
       let pdf = splitFile(d).name & ".pdf"
       let dest = destPath / pdf