diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-11-18 13:41:17 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-11-18 13:41:17 -0800 |
| commit | 2329a254b480a5a0bbe13079dd4bed6b38dfc126 (patch) | |
| tree | 13a6f3379c7a5413320e15565d570a23cc0b2ae0 /Makefile | |
| parent | bd9c66668c6fe45d640bce208da61bd1c864e104 (diff) | |
| parent | 1394d5856b4c7b7ade1f1accbd9bffeea2e2144d (diff) | |
| download | android-node-v8-2329a254b480a5a0bbe13079dd4bed6b38dfc126.tar.gz android-node-v8-2329a254b480a5a0bbe13079dd4bed6b38dfc126.tar.bz2 android-node-v8-2329a254b480a5a0bbe13079dd4bed6b38dfc126.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/README.md
deps/uv/build.mk
deps/uv/src/unix/core.c
deps/uv/src/unix/darwin-proctitle.c
deps/uv/src/unix/darwin.c
deps/uv/src/unix/fsevents.c
deps/uv/src/unix/udp.c
deps/uv/src/version.c
deps/v8/src/platform-solaris.cc
deps/v8/test/cctest/test-api.cc
lib/tls.js
src/node.h
src/node_version.h
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -53,9 +53,9 @@ endif out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi ifeq ($(USE_NINJA),1) touch out/Makefile - $(PYTHON) tools/gyp_node -f ninja + $(PYTHON) tools/gyp_node.py -f ninja else - $(PYTHON) tools/gyp_node -f make + $(PYTHON) tools/gyp_node.py -f make endif config.gypi: configure |