Merge remote-tracking branch 'origin/devel' into bitsize-pragma

2015-09-30 11:43:59 -07:00 · 2015-09-30 11:43:59 -07:00 · 87ab263d52
commit 87ab263d52
parent 8450ee9d59 dd2225fe07
6 changed files with 27 additions and 9 deletions
--- a/tests/newconfig/tfoo.nim
+++ b/tests/newconfig/tfoo.nim
@ -4,4 +4,7 @@ discard """
  msg: '''[NimScript] exec: gcc -v'''
 """

+when not defined(definedefine):
+  {.fatal: "wrong nim script configuration".}
+
 echo "hello world!"
--- a/tests/newconfig/tfoo.nims
+++ b/tests/newconfig/tfoo.nims
@ -10,5 +10,6 @@ task listDirs, "lists every subdirectory":
    echo "DIR ", x

 task default, "default target":
+  --define: definedefine
  setCommand "c"