fix build from scratch

just-js · Dec 18, 2020 · 0afae92 · 0afae92
1 parent 1112b08
commit 0afae92
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -35,12 +35,12 @@ function make (opts, ...args) {
   const { silent } = opts
   if (silent) {
     // todo - why are we overriding C and CC here?
-    const process = launch('make', ['C=gcc', 'CC=g++', ...args], currentDir)
+    const process = launch('make', [...args], currentDir)
     process.onStdout = (buf, len) => {}
     process.onStderr = (buf, len) => {}
     return watch(process)
   }
-  return watch(launch('make', ['C=gcc', 'CC=g++', ...args], currentDir))
+  return watch(launch('make', [...args], currentDir))
 }
 
 const rx = /[./]/g

diff --git a/lib/configure.js b/lib/configure.js
@@ -1,6 +1,7 @@
 const { baseName, fileName, join } = just.path
 const acorn = require('acorn')
 const { isFile, isDir } = require('fs')
+const { mkdir, writeFile } = just.fs
 const { launch } = just.process
 const appRoot = just.sys.cwd()
 const cache = createCache()
@@ -48,7 +49,7 @@ function getExternalLibrary (originalFileName, fileName) {
   if (config.external[originalFileName]) {
     just.print(`${originalFileName} found in config`)
   } else {
-    const libsDir = `${JUST_TARGET}/lib`
+    const libsDir = `${JUST_TARGET}/lib/pg`
     if (!isDir(libsDir)) {
       just.fs.chdir(JUST_TARGET)
       const process = make('libs')
@@ -208,6 +209,19 @@ function configure (scriptName, opts = {}) {
     moduleCache[module.name] = module
   }
   if (!config.external) config.external = {}
+  if (!isDir(JUST_TARGET)) {
+    mkdir(JUST_TARGET)
+    mkdir(`${JUST_TARGET}/lib`)
+  }
+  for (const fileName of builtin.embeds) {
+    const fn = `${JUST_TARGET}/${fileName}`
+    if (!isFile(fn)) writeFile(fn, ArrayBuffer.fromString(just.builtin(fileName)))
+  }
+  for (const fileName of builtin.libs) {
+    const fn = `${JUST_TARGET}/${fileName}`
+    if (!isFile(fn)) writeFile(fn, ArrayBuffer.fromString(just.builtin(fileName)))
+  }
+  if (!isFile(`${JUST_TARGET}/Makefile`)) writeFile(`${JUST_TARGET}/Makefile`, ArrayBuffer.fromString(just.builtin('Makefile')))
   const { index, libs, modules } = parse(scriptName)
   const builtinModules = config.modules.map(v => v.name)
   if (!config.target || config.target === 'just') {