From d7bcf21340b834791b56cdfc0af76e54327f928f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 8 Nov 2011 00:25:51 +0100 Subject: [PATCH] build: fix race in parallel build Run `make clean` first, *then* `make all` --- wscript | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wscript b/wscript index e0c66535c1c..02ede45ad28 100644 --- a/wscript +++ b/wscript @@ -634,12 +634,11 @@ def uv_cmd(bld, variant): # cmd = 'cp -r ' + sh_escape(srcdir) + '/* ' + sh_escape(blddir) if not sys.platform.startswith('win32'): - cmd += ' && if [[ -z "$NODE_MAKE" ]]; then NODE_MAKE=make; fi; ' - cmd += '$NODE_MAKE -C ' + sh_escape(blddir) + make = ('if [ -z "$NODE_MAKE" ]; then NODE_MAKE=make; fi; ' + '$NODE_MAKE -C ' + sh_escape(blddir)) else: - cmd += ' && make -C ' + sh_escape(blddir) - cmd += ' clean all' - return cmd + make = 'make -C ' + sh_escape(blddir) + return '%s && (%s clean) && (%s all)' % (cmd, make, make) def build_uv(bld):