finish up

compiler/nim.cfg

@@ -2,9 +2,10 @@
 
 hint[XDeclaredButNotUsed]:off
 
-# config needed for nif to import the compiler:
-define:nifCompilerInPath
+# allow dependencies to import the compiler via `import compiler / ...`:
 path:".."
+# nif uses `--path:$nim` by default, make it use the current compiler instead:
+define:nifCompilerInPath
 
 define:booting
 define:nimcore

compiler/nim.nim

@@ -28,7 +28,9 @@ import
   commands, options, msgs, extccomp, main, idents, lineinfos, cmdlinehelper,
   pathutils, modulegraphs
 
-import ../dist/nif/src/[nifler/nifler, xelim/xelim, nifgram/nifgram, gear2/gear2]
+when defined(testNifImports):
+  # temporary until nif is actually used in the compiler
+  import ../dist/nif/src/[nifler/nifler, xelim/xelim, nifgram/nifgram, gear2/gear2]
 
 from std/browsers import openDefaultBrowser
 from nodejs import findNodeJs

koch.nim

@@ -596,7 +596,8 @@ proc runCI(cmd: string) =
   # boot without -d:nimHasLibFFI to make sure this still works
   # `--lib:lib` is needed for bootstrap on openbsd, for reasons described in
   # https://github.com/nim-lang/Nim/pull/14291 (`getAppFilename` bugsfor older nim on openbsd).
-  kochExecFold("Boot Nim ORC", "boot -d:release -d:nimStrictMode --lib:lib")
+  kochExecFold("Boot Nim ORC", "boot -d:release -d:nimStrictMode --lib:lib -d:testNifImports")
+    # remove -d:testNifImports when nif is actually used
 
   when false: # debugging: when you need to run only 1 test in CI, use something like this:
     execFold("debugging test", "nim r tests/stdlib/tosproc.nim")

lib/system.nim

@@ -166,6 +166,7 @@ when defined(nimHasEnsureMove):
     discard "implemented in injectdestructors"
 else:
   template ensureMove*[T](x: T): T =
+    # no-op for bootstrapping
     x
 
 type