import graph

internal/engine.cm

@@ -420,7 +420,7 @@ core_extras.native_mode = native_mode
 
 // NOW load shop -- it receives all of the above via env
 var shop = use_core('internal/shop')
-if (native_mode) use_core('build')
+use_core('build')
 var time = use_core('time')
 var toml = use_core('toml')
 
@@ -498,10 +498,8 @@ function pretty_format(rec) {
   var out = null
   var i = 0
   var fr = null
-  if (rec.source && rec.source.file)
-    src = rec.source.file + ":" + text(rec.source.line)
   ev = is_text(rec.event) ? rec.event : json.encode(rec.event, false)
-  out = `[${aid}] [${rec.channel}] ${src} ${ev}\n`
+  out = `[${aid}] [${rec.channel}] ${ev}\n`
   if (rec.stack && length(rec.stack) > 0) {
     for (i = 0; i < length(rec.stack); i = i + 1) {
       fr = rec.stack[i]
@@ -1248,6 +1246,20 @@ $_.clock(_ => {
   }
 
   var pkg = file_info ? file_info.package : null
+
+  // Pre-build C modules for all transitive dependencies
+  var _deps = null
+  var _di = 0
+  if (pkg && shop.ensure_package_dylibs) {
+    _deps = package.gather_dependencies(pkg)
+    _di = 0
+    while (_di < length(_deps)) {
+      shop.ensure_package_dylibs(_deps[_di])
+      _di = _di + 1
+    }
+    shop.ensure_package_dylibs(pkg)
+  }
+
   env.use = function(path) {
     var ck = 'core/' + path
     if (use_cache[ck]) return use_cache[ck]