summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-02-06 17:20:07 (GMT)
committerEvan Martin <martine@danga.com>2011-02-06 17:20:07 (GMT)
commitf3b38a89eb23bd460c952acee71167aa96da7fb4 (patch)
tree6f67bfe1aa63508b0166cf354af803ad24e587c9
parente6a3ed4c7f7e1295de185dccdd0df22d3a90af12 (diff)
downloadNinja-f3b38a89eb23bd460c952acee71167aa96da7fb4.zip
Ninja-f3b38a89eb23bd460c952acee71167aa96da7fb4.tar.gz
Ninja-f3b38a89eb23bd460c952acee71167aa96da7fb4.tar.bz2
clean up bootstrap
-rw-r--r--HACKING4
-rwxr-xr-xbootstrap.sh9
2 files changed, 8 insertions, 5 deletions
diff --git a/HACKING b/HACKING
index 84534e6..ac69256 100644
--- a/HACKING
+++ b/HACKING
@@ -3,8 +3,8 @@ Generating the docs:
./ninja doc
Adjusting build flags:
- Just a hack, but edit config.ninja (which was generated by bootstrap.sh)
- to turn on debugging symbols.
+ It's kind of a hack, but edit config.ninja (which was generated by
+ bootstrap.sh) to turn on debugging symbols.
Test-driven development:
Set your build command to
diff --git a/bootstrap.sh b/bootstrap.sh
index 637e0d0..4761cc7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,12 +8,15 @@ conf_cflags = -O2
conf_ldflags = -s
# When developing:
# conf_cflags = -g -Wall
-# conf_ldlags = -g -Wall
+# conf_ldlags =
EOT
+
+echo "Building ninja manually..."
srcs=$(ls src/*.cc | grep -v test)
-echo "Building stage 1..."
g++ -Wno-deprecated -o ninja.bootstrap $srcs
-echo "Building final result..."
+
+echo "Building ninja using itself..."
./ninja.bootstrap ninja
rm ninja.bootstrap
+
echo "Done!"