Merge pull request #58 from danw/builddir
Stop using bootstrap.bash -b for separate builddir
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index eebd59c..dbc4710 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -78,7 +78,7 @@
bootstrap = pctx.StaticRule("bootstrap",
blueprint.RuleParams{
- Command: "$bootstrapCmd -i $in -b $buildDir",
+ Command: "BUILDDIR=$buildDir $bootstrapCmd -i $in",
Description: "bootstrap $in",
Generator: true,
})
diff --git a/build.ninja.in b/build.ninja.in
index 49d808a..a782142 100644
--- a/build.ninja.in
+++ b/build.ninja.in
@@ -30,7 +30,7 @@
builddir = ${g.bootstrap.buildDir}/.minibootstrap
rule g.bootstrap.bootstrap
- command = ${g.bootstrap.bootstrapCmd} -i ${in} -b ${g.bootstrap.buildDir}
+ command = BUILDDIR=${g.bootstrap.buildDir} ${g.bootstrap.bootstrapCmd} -i ${in}
description = bootstrap ${in}
generator = true
