Use npm_config_arch environment variable to define the architecture

Author: piranna

package.json

@@ -26,13 +26,13 @@
   "homepage": "https://github.com/NodeOS/nodejs#readme",
   "dependencies": {
     "nodeos-cross-toolchain": "^1.0.0-RC3",
-    "prebuild-install": "1.0.2"
+    "prebuild-install": "piranna/prebuild-install#patch-1"
   },
   "devDependencies": {
     "buho": "^0.2.1",
     "ci-publish": "^1.3.0",
     "minimist": "^1.2.0",
-    "prebuild": "^5.1.0",
+    "prebuild": "^5.1.2",
     "qemu": "^2.7.0",
     "suppose": "^0.6.1"
   },

scripts/build

@@ -50,7 +50,7 @@ esac
 
 TAR_FILE=`pwd`/deps/node-$NODEJS_VERSION.tar.gz
 SRC_DIR=`pwd`/deps/node
-OBJ_DIR=build/$MACHINE/$CPU
+OBJ_DIR=build/$NODE_ARCH
 OUT_DIR=`pwd`
 PRODUCTS=(bin include share)
 PREBUILD=prebuilds/$NODE_PLATFORM-$NODE_ARCH.tar.gz

scripts/install

@@ -3,6 +3,9 @@
 URL=https://github.com/NodeOS/nodejs/releases/download/v{version}/{platform}-{arch}.tar.gz
 
 
+NODE_ARCH=$npm_config_arch
+
+
 while getopts ":-:" opt; do
   case $opt in
     -)
@@ -17,6 +20,9 @@ done
 
 
 case $NODE_ARCH in
+  "")
+  ;;
+
   arm)
     CPU=cortex-a7
   ;;
@@ -34,7 +40,12 @@ case $NODE_ARCH in
     BITS=64
     MACHINE=pc
   ;;
+
+  *)
+    echo "Unknown architecture $NODE_ARCH"
+    exit 1
+  ;;
 esac
 
 
-prebuild-install $@ -d $URL || BITS=$BITS CPU=$CPU MACHINE=$MACHINE npm run build
+prebuild-install -d $URL || BITS=$BITS CPU=$CPU MACHINE=$MACHINE npm run build