diff options
| author | Araq <rumpf_a@web.de> | 2018-12-16 19:22:49 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-12-16 19:22:49 +0100 |
| commit | d66eb04ce9f5da6149744a07ca3b9adbfe9705a6 (patch) | |
| tree | 757d6f3d1c679737b0d4f764735a89d7a2ee8cb7 | |
| parent | 7ec77684e9d4c429efae64e9141bf549faef3865 (diff) | |
| download | Nim-d66eb04ce9f5da6149744a07ca3b9adbfe9705a6.tar.gz | |
fixes #8991, fixes #4446
| -rw-r--r-- | compiler/cmdlinehelper.nim | 2 | ||||
| -rw-r--r-- | lib/system.nim | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim index 5e7afa0ba..bf7100e34 100644 --- a/compiler/cmdlinehelper.nim +++ b/compiler/cmdlinehelper.nim @@ -50,7 +50,7 @@ proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: Confi when false: # These defines/options should not be enabled while processing nimscript - # bug #4446, #9420, #8991, #9589, #9153 + # bug #4446, #9420, #8991 undefSymbol(conf.symbols, "profiler") undefSymbol(conf.symbols, "memProfiler") undefSymbol(conf.symbols, "nodejs") diff --git a/lib/system.nim b/lib/system.nim index d51f9e899..2497d39a6 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -1539,7 +1539,7 @@ else: ## ``string`` if the taint mode is not ## turned on. -when defined(profiler): +when defined(profiler) and not defined(nimscript): proc nimProfile() {.compilerProc, noinline.} when hasThreadSupport: {.pragma: rtlThreadVar, threadvar.} @@ -3569,7 +3569,7 @@ when not defined(JS): #and not defined(nimscript): when defined(endb) and not defined(nimscript): include "system/debugger" - when defined(profiler) or defined(memProfiler): + when (defined(profiler) or defined(memProfiler)) and not defined(nimscript): include "system/profiler" {.pop.} # stacktrace |