summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2010-11-29 03:21:21 (GMT)
committerEvan Martin <martine@danga.com>2010-11-29 03:21:21 (GMT)
commitcf5d4792ff4b6f8291aadc21bfa2e9aaab0df62a (patch)
tree4cbaa608b7c396b3cb4c348d512cbb774612f7ee
parent73d5d7f980b31afbd5c8d7374e072651298d7bc4 (diff)
downloadNinja-cf5d4792ff4b6f8291aadc21bfa2e9aaab0df62a.zip
Ninja-cf5d4792ff4b6f8291aadc21bfa2e9aaab0df62a.tar.gz
Ninja-cf5d4792ff4b6f8291aadc21bfa2e9aaab0df62a.tar.bz2
update bootstrap
-rw-r--r--README.asciidoc4
-rwxr-xr-xbootstrap.sh5
2 files changed, 5 insertions, 4 deletions
diff --git a/README.asciidoc b/README.asciidoc
index cb0eee5..b348459 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -53,8 +53,8 @@ Getting started
---------------
The included `bootstrap.sh` should hopefully produce a working `ninja`
-binary. You can then have ninja build itself with the proper build
-settings by running `./ninja ninja`.
+binary, by first blindly compiling all non-test files together then
+re-building ninja using itself.
Usage is currently just
diff --git a/bootstrap.sh b/bootstrap.sh
index d9a2e2b..df726b5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,7 +4,8 @@ set -e
srcs=$(ls *.cc | grep -v test)
echo "Building stage 1..."
-g++ -o ninja $srcs
+g++ -o ninja.bootstrap $srcs
echo "Building final result..."
-./ninja ninja
+./ninja.bootstrap ninja
+rm ninja.bootstrap
echo "Done!"