diff options
| author | Evan Martin <martine@danga.com> | 2011-12-02 05:34:34 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2011-12-02 05:35:55 (GMT) |
| commit | 70623a8dce092fb2bf182583d86ff56440355df9 (patch) | |
| tree | 26782d3a29d130c36bd6d7a48a39bfce8b86ef5b | |
| parent | 757c74f9593514144db146e1742b190b59b3aabb (diff) | |
| download | Ninja-70623a8dce092fb2bf182583d86ff56440355df9.zip Ninja-70623a8dce092fb2bf182583d86ff56440355df9.tar.gz Ninja-70623a8dce092fb2bf182583d86ff56440355df9.tar.bz2 | |
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.
| -rwxr-xr-x | bootstrap.sh | 6 |
1 files 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!" |