Run makevars singleton after all other registered singletons

Move the makevars singleton after all dyamically registered
singletons, but before the env singleton, to ensure that it
can reference values initialized in other singletons.

Test: m checkbuild
Change-Id: I6ea45d3a174b94d4e89f3168894399e7022733e4
This commit is contained in:
Colin Cross
2019-02-09 22:59:32 -08:00
parent e48ff5bbd4
commit 580d2ce642
2 changed files with 4 additions and 4 deletions

View File

@@ -92,10 +92,6 @@ func RegisterMakeVarsProvider(pctx PackageContext, provider MakeVarsProvider) {
///////////////////////////////////////////////////////////////////////////////
func init() {
RegisterSingletonType("makevars", makeVarsSingletonFunc)
}
func makeVarsSingletonFunc() Singleton {
return &makeVarsSingleton{}
}