tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #301 from c-parsons/modulelistfile

Browse source
This commit is contained in:
colincross 2020-06-04 14:42:05 -07:00 committed by GitHub
commit 1160e9826f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap/command.go
View file

@ -41,10 +41,10 @@ var (
traceFile string
runGoTests bool
noGC bool
moduleListFile string
emptyNinjaFile bool
BuildDir string
ModuleListFile string
NinjaBuildDir string
SrcDir string
@ -105,9 +105,9 @@ func Main(ctx *blueprint.Context, config interface{}, extraNinjaFileDeps ...stri
}
SrcDir = filepath.Dir(flag.Arg(0))
if moduleListFile != "" {
ctx.SetModuleListFile(moduleListFile)
extraNinjaFileDeps = append(extraNinjaFileDeps, moduleListFile)
if ModuleListFile != "" {
ctx.SetModuleListFile(ModuleListFile)
extraNinjaFileDeps = append(extraNinjaFileDeps, ModuleListFile)
} else {
fatalf("-l <moduleListFile> is required and must be nonempty")
}
@ -133,7 +133,7 @@ func Main(ctx *blueprint.Context, config interface{}, extraNinjaFileDeps ...stri
topLevelBlueprintsFile: flag.Arg(0),
emptyNinjaFile: emptyNinjaFile,
runGoTests: runGoTests,
moduleListFile: moduleListFile,
moduleListFile: ModuleListFile,
}
ctx.RegisterBottomUpMutator("bootstrap_plugin_deps", pluginDeps)