summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--compiler/vmops.nim1
-rw-r--r--lib/std/compilesettings.nim3
-rw-r--r--tests/vm/tcompilesetting.nim3
3 files changed, 5 insertions, 2 deletions
diff --git a/compiler/vmops.nim b/compiler/vmops.nim
index 22a632ee9..018e7b9c6 100644
--- a/compiler/vmops.nim
+++ b/compiler/vmops.nim
@@ -135,6 +135,7 @@ when defined(nimHasInvariant):
     of backend: result = $conf.backend
     of libPath: result = conf.libpath.string
     of gc: result = $conf.selectedGC
+    of mm: result = $conf.selectedGC
 
   proc querySettingSeqImpl(conf: ConfigRef, switch: BiggestInt): seq[string] =
     template copySeq(field: untyped): untyped =
diff --git a/lib/std/compilesettings.nim b/lib/std/compilesettings.nim
index 5bb0bd673..6d8bd22f4 100644
--- a/lib/std/compilesettings.nim
+++ b/lib/std/compilesettings.nim
@@ -32,7 +32,8 @@ type
     backend           ## the backend (eg: c|cpp|objc|js); both `nim doc --backend:js`
                       ## and `nim js` would imply backend=js
     libPath           ## the absolute path to the stdlib library, i.e. nim's `--lib`, since 1.5.1
-    gc                ## gc selected
+    gc {.deprecated.} ## gc selected
+    mm                ## memory management selected
 
   MultipleValueSetting* {.pure.} = enum ## \
                       ## settings resulting in a seq of string values
diff --git a/tests/vm/tcompilesetting.nim b/tests/vm/tcompilesetting.nim
index 5bf559c74..d6c08e70f 100644
--- a/tests/vm/tcompilesetting.nim
+++ b/tests/vm/tcompilesetting.nim
@@ -1,5 +1,5 @@
 discard """
-cmd: "nim c --nimcache:build/myNimCache --nimblePath:myNimblePath $file"
+cmd: "nim c --nimcache:build/myNimCache --nimblePath:myNimblePath --gc:arc $file"
 joinable: false
 """
 
@@ -12,6 +12,7 @@ template main =
   doAssert "myNimblePath" in nimblePaths.querySettingSeq[0]
   doAssert querySetting(backend) == "c"
   doAssert fileExists(libPath.querySetting / "system.nim")
+  doAssert querySetting(mm) == "arc"
 
 static: main()
 main()