Skip to content

Commit

Permalink
Merge pull request #161 from mapbox/travis-fix
Browse files Browse the repository at this point in the history
Fixes travis on master branch
  • Loading branch information
springmeyer authored Aug 26, 2019
2 parents 7ceb3de + 24a381b commit d65c204
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ export WERROR ?= false

default: release

node_modules:
./node_modules/.bin/node-pre-gyp:
# install deps but for now ignore our own install script
# so that we can run it directly in either debug or release
npm install --ignore-scripts

release: node_modules
release: ./node_modules/.bin/node-pre-gyp
V=1 ./node_modules/.bin/node-pre-gyp configure build --error_on_warnings=$(WERROR) --loglevel=error
@echo "run 'make clean' for full rebuild"

debug: node_modules
debug: ./node_modules/.bin/node-pre-gyp
V=1 ./node_modules/.bin/node-pre-gyp configure build --error_on_warnings=$(WERROR) --loglevel=error --debug
@echo "run 'make clean' for full rebuild"

Expand Down Expand Up @@ -46,7 +46,7 @@ distclean: clean
rm -rf .toolchain
rm -f local.env

xcode: node_modules
xcode: ./node_modules/.bin/node-pre-gyp
./node_modules/.bin/node-pre-gyp configure -- -f xcode

@# If you need more targets, e.g. to run other npm scripts, duplicate the last line and change NPM_ARGUMENT
Expand Down

0 comments on commit d65c204

Please sign in to comment.