From 70623a8dce092fb2bf182583d86ff56440355df9 Mon Sep 17 00:00:00 2001 From: Evan Martin Date: Thu, 1 Dec 2011 21:34:34 -0800 Subject: [PATCH] bootstrap.sh: windows (mingw) fixes - Don't build browse.cc in bootstrap.sh. - Explicitly call out to Python to run configure.py. - Run ninja-bootstrap with no arguments to build the default target, which is "ninja.exe" on Windows. --- bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index af9cd08..7c62af3 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -34,7 +34,7 @@ mkdir -p build case "$SYSTEMNAME" in MINGW32*) - srcs=$(ls src/*.cc | grep -v test | grep -v subprocess.cc) + srcs=$(ls src/*.cc | grep -v test | egrep -v 'browse.cc|subprocess.cc') ;; *) srcs=$(ls src/*.cc | grep -v test | grep -v subprocess-win32.cc) @@ -44,8 +44,8 @@ esac ${CXX:-g++} -Wno-deprecated ${CFLAGS} ${LDFLAGS} -o ninja.bootstrap $srcs echo "Building ninja using itself..." -./configure.py -./ninja.bootstrap ninja +python ./configure.py +./ninja.bootstrap rm ninja.bootstrap echo "Done!" -- 2.7.4