From 6effe4553bfc8a57e6d718bfb147905393c2a943 Mon Sep 17 00:00:00 2001 From: flyx Date: Tue, 31 Jan 2017 10:31:48 +0100 Subject: execute pdflatex in nonstopmode (#5305) * Name is irritating; nonstopmode stops execution if an error occurs instead of asking the user for input. --- tools/nimweb.nim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 -- cgit 1.4.1-2-gfad0 From 8071648129909d47ff7d8d071938ba4c078fc7e4 Mon Sep 17 00:00:00 2001 From: Axel Pahl Date: Tue, 31 Jan 2017 11:32:08 +0100 Subject: revert nim.cfg to version before b26e6e3 (#5306) ... to enable building of koch on Linux again --- config/nim.cfg | 10 ++-------- 1 file changed, 2 insertions(+), 8 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 -- cgit 1.4.1-2-gfad0