1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use same make as when originally invoked

Browse Source
This commit is contained in:
Robert Mustacchi 2011-05-19 19:51:30 -07:00 committed by Ryan Dahl
parent 317653b4df
commit 7ea19d02fd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -2,6 +2,14 @@ WAF=python tools/waf-light
web_root = ryan@nodejs.org:~/web/nodejs.org/ web_root = ryan@nodejs.org:~/web/nodejs.org/
#
# Because we recursively call make from waf we need to make sure that we are
# using the correct make. Not all makes are GNU Make, but this likely only
# works with gnu make. To deal with this we remember how the user invoked us
# via a make builtin variable and use that in all subsequent operations
#
export NODE_MAKE := $(MAKE)
all: program all: program
all-progress: all-progress:

2
wscript
View File

@ -599,7 +599,7 @@ def uv_cmd(bld, variant):
# modifying libuv's build to send object files to a separate directory. # modifying libuv's build to send object files to a separate directory.
# #
cmd = 'cp -r ' + sh_escape(srcdir) + '/* ' + sh_escape(blddir) + \ cmd = 'cp -r ' + sh_escape(srcdir) + '/* ' + sh_escape(blddir) + \
' && make -C ' + sh_escape(blddir) ' && if [[ -z "$NODE_MAKE" ]]; then NODE_MAKE=make; fi; $NODE_MAKE -C ' + sh_escape(blddir)
return cmd return cmd