Merge pull request #48 from danw/go1.5
Support go 1.5
diff --git a/bootstrap.bash b/bootstrap.bash
index d474cc4..ff60e21 100755
--- a/bootstrap.bash
+++ b/bootstrap.bash
@@ -59,6 +59,21 @@
# If RUN_TESTS is set, behave like -t was passed in as an option.
[ ! -z "$RUN_TESTS" ] && EXTRA_ARGS="$EXTRA_ARGS -t"
+GOTOOLDIR="$GOROOT/pkg/tool/${GOOS}_$GOARCH"
+GOCOMPILE="$GOTOOLDIR/${GOCHAR}g"
+GOLINK="$GOTOOLDIR/${GOCHAR}l"
+
+if [ ! -f $GOCOMPILE ]; then
+ GOCOMPILE="$GOTOOLDIR/compile"
+fi
+if [ ! -f $GOLINK ]; then
+ GOLINK="$GOTOOLDIR/link"
+fi
+if [[ ! -f $GOCOMPILE || ! -f $GOLINK ]]; then
+ echo "Cannot find go tools under $GOROOT"
+ exit 1
+fi
+
usage() {
echo "Usage of ${BOOTSTRAP}:"
echo " -h: print a help message and exit"
@@ -108,9 +123,8 @@
sed -e "s|@@SrcDir@@|$SRCDIR|g" \
-e "s|@@BuildDir@@|$BUILDDIR|g" \
-e "s|@@GoRoot@@|$GOROOT|g" \
- -e "s|@@GoOS@@|$GOOS|g" \
- -e "s|@@GoArch@@|$GOARCH|g" \
- -e "s|@@GoChar@@|$GOCHAR|g" \
+ -e "s|@@GoCompile@@|$GOCOMPILE|g" \
+ -e "s|@@GoLink@@|$GOLINK|g" \
-e "s|@@Bootstrap@@|$BOOTSTRAP|g" \
-e "s|@@BootstrapManifest@@|$BOOTSTRAP_MANIFEST|g" \
$IN > $BUILDDIR/build.ninja
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index 98c587e..b157440 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -29,23 +29,21 @@
var (
pctx = blueprint.NewPackageContext("github.com/google/blueprint/bootstrap")
- gcCmd = pctx.StaticVariable("gcCmd", "$goToolDir/${goChar}g")
- linkCmd = pctx.StaticVariable("linkCmd", "$goToolDir/${goChar}l")
goTestMainCmd = pctx.StaticVariable("goTestMainCmd", filepath.Join(bootstrapDir, "bin", "gotestmain"))
chooseStageCmd = pctx.StaticVariable("chooseStageCmd", filepath.Join(bootstrapDir, "bin", "choosestage"))
- gc = pctx.StaticRule("gc",
+ compile = pctx.StaticRule("compile",
blueprint.RuleParams{
- Command: "GOROOT='$goRoot' $gcCmd -o $out -p $pkgPath -complete " +
+ Command: "GOROOT='$goRoot' $compileCmd -o $out -p $pkgPath -complete " +
"$incFlags -pack $in",
- Description: "${goChar}g $out",
+ Description: "compile $out",
},
"pkgPath", "incFlags")
link = pctx.StaticRule("link",
blueprint.RuleParams{
Command: "GOROOT='$goRoot' $linkCmd -o $out $libDirFlags $in",
- Description: "${goChar}l $out",
+ Description: "link $out",
},
"libDirFlags")
@@ -362,7 +360,7 @@
srcFiles := pathtools.PrefixPaths(srcs, srcDir)
var incFlags []string
- deps := []string{"$gcCmd"}
+ deps := []string{"$compileCmd"}
ctx.VisitDepsDepthFirstIf(isGoPackageProducer,
func(module blueprint.Module) {
dep := module.(goPackageProducer)
@@ -372,21 +370,21 @@
deps = append(deps, target)
})
- gcArgs := map[string]string{
+ compileArgs := map[string]string{
"pkgPath": pkgPath,
}
if len(incFlags) > 0 {
- gcArgs["incFlags"] = strings.Join(incFlags, " ")
+ compileArgs["incFlags"] = strings.Join(incFlags, " ")
}
ctx.Build(pctx, blueprint.BuildParams{
- Rule: gc,
+ Rule: compile,
Outputs: []string{archiveFile},
Inputs: srcFiles,
OrderOnly: orderDeps,
Implicits: deps,
- Args: gcArgs,
+ Args: compileArgs,
})
}
@@ -428,10 +426,10 @@
})
ctx.Build(pctx, blueprint.BuildParams{
- Rule: gc,
+ Rule: compile,
Outputs: []string{testArchive},
Inputs: []string{mainFile},
- Implicits: []string{testPkgArchive},
+ Implicits: []string{"$compileCmd", testPkgArchive},
Args: map[string]string{
"pkgPath": "main",
"incFlags": "-I " + testRoot,
diff --git a/bootstrap/config.go b/bootstrap/config.go
index 5f8b551..5752484 100644
--- a/bootstrap/config.go
+++ b/bootstrap/config.go
@@ -21,15 +21,11 @@
srcDir = pctx.StaticVariable("srcDir", "@@SrcDir@@")
buildDir = pctx.StaticVariable("buildDir", "@@BuildDir@@")
goRoot = pctx.StaticVariable("goRoot", "@@GoRoot@@")
- goOS = pctx.StaticVariable("goOS", "@@GoOS@@")
- goArch = pctx.StaticVariable("goArch", "@@GoArch@@")
- goChar = pctx.StaticVariable("goChar", "@@GoChar@@")
+ compileCmd = pctx.StaticVariable("compileCmd", "@@GoCompile@@")
+ linkCmd = pctx.StaticVariable("linkCmd", "@@GoLink@@")
bootstrapCmd = pctx.StaticVariable("bootstrapCmd", "@@Bootstrap@@")
bootstrapManifest = pctx.StaticVariable("bootstrapManifest",
"@@BootstrapManifest@@")
-
- goToolDir = pctx.StaticVariable("goToolDir",
- "$goRoot/pkg/tool/${goOS}_$goArch")
)
type ConfigInterface interface {
diff --git a/bootstrap/doc.go b/bootstrap/doc.go
index 573ff7b..4394ebe 100644
--- a/bootstrap/doc.go
+++ b/bootstrap/doc.go
@@ -119,9 +119,8 @@
// @@SrcDir@@ - The path to the root source directory (either
// absolute or relative to the build dir)
// @@GoRoot@@ - The path to the root directory of the Go toolchain
-// @@GoOS@@ - The OS string for the Go toolchain
-// @@GoArch@@ - The CPU architecture for the Go toolchain
-// @@GoChar@@ - The CPU arch character for the Go toolchain
+// @@GoCompile@@ - The path to the Go compiler (6g or compile)
+// @@GoLink@@ - The path to the Go linker (6l or link)
// @@Bootstrap@@ - The path to the bootstrap script
// @@BootstrapManifest@@ - The path to the source bootstrap Ninja file
//
diff --git a/build.ninja.in b/build.ninja.in
index 7ef5c56..feaad7a 100644
--- a/build.ninja.in
+++ b/build.ninja.in
@@ -19,19 +19,11 @@
g.bootstrap.chooseStageCmd = ${g.bootstrap.buildDir}/.bootstrap/bin/choosestage
+g.bootstrap.compileCmd = @@GoCompile@@
+
g.bootstrap.goRoot = @@GoRoot@@
-g.bootstrap.goOS = @@GoOS@@
-
-g.bootstrap.goArch = @@GoArch@@
-
-g.bootstrap.goToolDir = ${g.bootstrap.goRoot}/pkg/tool/${g.bootstrap.goOS}_${g.bootstrap.goArch}
-
-g.bootstrap.goChar = @@GoChar@@
-
-g.bootstrap.gcCmd = ${g.bootstrap.goToolDir}/${g.bootstrap.goChar}g
-
-g.bootstrap.linkCmd = ${g.bootstrap.goToolDir}/${g.bootstrap.goChar}l
+g.bootstrap.linkCmd = @@GoLink@@
g.bootstrap.srcDir = @@SrcDir@@
@@ -46,17 +38,17 @@
command = ${g.bootstrap.chooseStageCmd} --current ${current} --bootstrap ${g.bootstrap.bootstrapManifest} -o ${out} ${in}
description = choosing next stage
+rule g.bootstrap.compile
+ command = GOROOT='${g.bootstrap.goRoot}' ${g.bootstrap.compileCmd} -o ${out} -p ${pkgPath} -complete ${incFlags} -pack ${in}
+ description = compile ${out}
+
rule g.bootstrap.cp
command = cp ${in} ${out}
description = cp ${out}
-rule g.bootstrap.gc
- command = GOROOT='${g.bootstrap.goRoot}' ${g.bootstrap.gcCmd} -o ${out} -p ${pkgPath} -complete ${incFlags} -pack ${in}
- description = ${g.bootstrap.goChar}g ${out}
-
rule g.bootstrap.link
command = GOROOT='${g.bootstrap.goRoot}' ${g.bootstrap.linkCmd} -o ${out} ${libDirFlags} ${in}
- description = ${g.bootstrap.goChar}l ${out}
+ description = link ${out}
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: blueprint
@@ -67,7 +59,7 @@
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
- : g.bootstrap.gc ${g.bootstrap.srcDir}/context.go $
+ : g.bootstrap.compile ${g.bootstrap.srcDir}/context.go $
${g.bootstrap.srcDir}/live_tracker.go ${g.bootstrap.srcDir}/mangle.go $
${g.bootstrap.srcDir}/module_ctx.go $
${g.bootstrap.srcDir}/ninja_defs.go $
@@ -75,7 +67,7 @@
${g.bootstrap.srcDir}/ninja_writer.go $
${g.bootstrap.srcDir}/package_ctx.go ${g.bootstrap.srcDir}/scope.go $
${g.bootstrap.srcDir}/singleton_ctx.go ${g.bootstrap.srcDir}/unpack.go $
- | ${g.bootstrap.gcCmd} $
+ | ${g.bootstrap.compileCmd} $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a
@@ -93,12 +85,13 @@
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
- : g.bootstrap.gc ${g.bootstrap.srcDir}/bootstrap/bootstrap.go $
+ : g.bootstrap.compile ${g.bootstrap.srcDir}/bootstrap/bootstrap.go $
${g.bootstrap.srcDir}/bootstrap/cleanup.go $
${g.bootstrap.srcDir}/bootstrap/command.go $
${g.bootstrap.srcDir}/bootstrap/config.go $
${g.bootstrap.srcDir}/bootstrap/doc.go $
- ${g.bootstrap.srcDir}/bootstrap/writedocs.go | ${g.bootstrap.gcCmd} $
+ ${g.bootstrap.srcDir}/bootstrap/writedocs.go | $
+ ${g.bootstrap.compileCmd} $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
@@ -119,8 +112,8 @@
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap-bpdoc/pkg/github.com/google/blueprint/bootstrap/bpdoc.a $
- : g.bootstrap.gc ${g.bootstrap.srcDir}/bootstrap/bpdoc/bpdoc.go | $
- ${g.bootstrap.gcCmd} $
+ : g.bootstrap.compile ${g.bootstrap.srcDir}/bootstrap/bpdoc/bpdoc.go | $
+ ${g.bootstrap.compileCmd} $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
@@ -139,8 +132,8 @@
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
- : g.bootstrap.gc ${g.bootstrap.srcDir}/deptools/depfile.go | $
- ${g.bootstrap.gcCmd}
+ : g.bootstrap.compile ${g.bootstrap.srcDir}/deptools/depfile.go | $
+ ${g.bootstrap.compileCmd}
pkgPath = github.com/google/blueprint/deptools
default $
${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a
@@ -154,10 +147,10 @@
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
- : g.bootstrap.gc ${g.bootstrap.srcDir}/parser/modify.go $
+ : g.bootstrap.compile ${g.bootstrap.srcDir}/parser/modify.go $
${g.bootstrap.srcDir}/parser/parser.go $
${g.bootstrap.srcDir}/parser/printer.go $
- ${g.bootstrap.srcDir}/parser/sort.go | ${g.bootstrap.gcCmd}
+ ${g.bootstrap.srcDir}/parser/sort.go | ${g.bootstrap.compileCmd}
pkgPath = github.com/google/blueprint/parser
default $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a
@@ -171,8 +164,8 @@
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
- : g.bootstrap.gc ${g.bootstrap.srcDir}/pathtools/lists.go $
- ${g.bootstrap.srcDir}/pathtools/glob.go | ${g.bootstrap.gcCmd}
+ : g.bootstrap.compile ${g.bootstrap.srcDir}/pathtools/lists.go $
+ ${g.bootstrap.srcDir}/pathtools/glob.go | ${g.bootstrap.compileCmd}
pkgPath = github.com/google/blueprint/pathtools
default $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a
@@ -186,8 +179,8 @@
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
- : g.bootstrap.gc ${g.bootstrap.srcDir}/proptools/proptools.go | $
- ${g.bootstrap.gcCmd}
+ : g.bootstrap.compile ${g.bootstrap.srcDir}/proptools/proptools.go | $
+ ${g.bootstrap.compileCmd}
pkgPath = github.com/google/blueprint/proptools
default $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a
@@ -200,8 +193,8 @@
# Defined: Blueprints:127:1
build ${g.bootstrap.buildDir}/.bootstrap/choosestage/obj/choosestage.a: $
- g.bootstrap.gc ${g.bootstrap.srcDir}/choosestage/choosestage.go | $
- ${g.bootstrap.gcCmd}
+ g.bootstrap.compile ${g.bootstrap.srcDir}/choosestage/choosestage.go | $
+ ${g.bootstrap.compileCmd}
pkgPath = choosestage
default ${g.bootstrap.buildDir}/.bootstrap/choosestage/obj/choosestage.a
@@ -222,8 +215,8 @@
# Defined: Blueprints:122:1
build ${g.bootstrap.buildDir}/.bootstrap/gotestmain/obj/gotestmain.a: $
- g.bootstrap.gc ${g.bootstrap.srcDir}/gotestmain/gotestmain.go | $
- ${g.bootstrap.gcCmd}
+ g.bootstrap.compile ${g.bootstrap.srcDir}/gotestmain/gotestmain.go | $
+ ${g.bootstrap.compileCmd}
pkgPath = gotestmain
default ${g.bootstrap.buildDir}/.bootstrap/gotestmain/obj/gotestmain.a
@@ -243,8 +236,9 @@
# Factory: github.com/google/blueprint/bootstrap.func·003
# Defined: Blueprints:101:1
-build ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/minibp.a: g.bootstrap.gc $
- ${g.bootstrap.srcDir}/bootstrap/minibp/main.go | ${g.bootstrap.gcCmd} $
+build ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/minibp.a: $
+ g.bootstrap.compile ${g.bootstrap.srcDir}/bootstrap/minibp/main.go | $
+ ${g.bootstrap.compileCmd} $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
