Merge branch 'master' into greenkeeper/update-all

Author: piranna

.gitignore

@@ -7,4 +7,5 @@ prebuilds/
 lib/
 libexec/
 share/
+include/
 *-nodeos-linux-musl*

.npmignore

@@ -7,6 +7,6 @@ prebuilds/
 lib/
 libexec/
 share/
-*-nodeos-linux-musl/
+*-nodeos-linux-musl*
 
-bin/*-nodeos-linux-musl-*
+bin/*-nodeos-linux-musl*

.travis.yml

@@ -1,10 +1,7 @@
-# While Travis Support has been implemented for OSX, it does not fully build
-# due to the build time limit and the vast ammount of warnings generated
-
 os:
+  - linux
   - osx
 osx_image: xcode7.3
-sudo: required
 language: node_js
 node_js:
   - "6.2.2"
@@ -14,7 +11,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp -r $TRAVIS_BUILD_DIR/* /Volumes/build ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd /Volumes/build ; fi
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install binutils ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gnu-sed --with-default-names ; fi
 script:
   - npm install
+  - npm run BigRedButton

README.md

@@ -5,10 +5,11 @@
 This package generate a cross-compiler based on [gcc](https://gcc.gnu.org/) and
 [musl](musl-libc.org) ready to use on the NodeOS build system, but could be used
 by other systems. You can be able to configure the target of the cross-compiler
-by setting some optional environment variables:
+by setting some optional build flags or environment variables:
 
-- **PLATFORM**: by default it will generate for the current system
-- **CPU**: by default it will generate for the current CPU
+- **-b**/**BITS**: select between 32 or 64 - only affects x86 builds
+- **-c**/**CPU**: by default it will generate for the current CPU
+- **-M**/**MACHINE**: target machine according QEmu definitions
 
 This `bin` folder contain placeholders for `npm` during the install step. They
-will be replaced later during the install process to their correct symlinks.
+are being replaced later during the install process to their correct symlinks.