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

see what breaks with a global config.nims (#10016)

Browse source 
* see what breaks with a global config.nims

* make tests green with a global config.nims file
This commit is contained in:
Andreas Rumpf 2018-12-18 09:29:15 +01:00 • committed by GitHub
commit d7d17d5ab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/commands.nim
View file

@ -590,10 +590,12 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
processOnOffSwitchG(conf, {optGenIndex}, arg, pass, info) processOnOffSwitchG(conf, {optGenIndex}, arg, pass, info)
of "import": of "import":
expectArg(conf, switch, arg, pass, info) expectArg(conf, switch, arg, pass, info)
if pass in {passCmd2, passPP}: conf.implicitImports.add arg if pass in {passCmd2, passPP}:
conf.implicitImports.add findModule(conf, arg, toFullPath(conf, info)).string
of "include": of "include":
expectArg(conf, switch, arg, pass, info) expectArg(conf, switch, arg, pass, info)
if pass in {passCmd2, passPP}: conf.implicitIncludes.add arg if pass in {passCmd2, passPP}:
conf.implicitIncludes.add findModule(conf, arg, toFullPath(conf, info)).string
of "listcmd": of "listcmd":
expectNoArg(conf, switch, arg, pass, info) expectNoArg(conf, switch, arg, pass, info)
incl(conf.globalOptions, optListCmd) incl(conf.globalOptions, optListCmd)

1
config/config.nims Normal file
View file

@ -0,0 +1 @@
# empty config.nims to prevent future regressions, see #9990

2
lib/system/ansi_c.nim
View file

@ -51,7 +51,7 @@ when defined(windows):
elif defined(macosx) or defined(linux) or defined(freebsd) or elif defined(macosx) or defined(linux) or defined(freebsd) or
defined(openbsd) or defined(netbsd) or defined(solaris) or defined(openbsd) or defined(netbsd) or defined(solaris) or
defined(dragonfly) or defined(nintendoswitch) or defined(genode) or defined(dragonfly) or defined(nintendoswitch) or defined(genode) or
defined(aix): defined(aix) or hostOS == "standalone":
const const
SIGABRT = cint(6) SIGABRT = cint(6)
SIGFPE = cint(8) SIGFPE = cint(8)