Expose real GccVersion
In order to validate that the NDK STL paths exists, we need to know the full path, including the Gcc version during the go execution. So instead of returning a ninja variable reference, just return the contents of the variable. This also fixes a few invalid uses of armGccVersion to the proper variable. Change-Id: I54398ba4aa4000235b7d537a2c4efe3ecbbeec8b
This commit is contained in:
@@ -111,14 +111,18 @@ var (
|
||||
}
|
||||
)
|
||||
|
||||
const (
|
||||
mipsGccVersion = "4.9"
|
||||
)
|
||||
|
||||
func init() {
|
||||
common.RegisterArchFeatures(common.Mips, "mips32r6",
|
||||
"rev6")
|
||||
|
||||
pctx.StaticVariable("mipsGccVersion", "4.9")
|
||||
pctx.StaticVariable("mipsGccVersion", mipsGccVersion)
|
||||
|
||||
pctx.StaticVariable("mipsGccRoot",
|
||||
"prebuilts/gcc/${HostPrebuiltTag}/mips/mips64el-linux-android-${armGccVersion}")
|
||||
"prebuilts/gcc/${HostPrebuiltTag}/mips/mips64el-linux-android-${mipsGccVersion}")
|
||||
|
||||
pctx.StaticVariable("mipsGccTriple", "mips64el-linux-android")
|
||||
|
||||
@@ -170,7 +174,7 @@ func (t *toolchainMips) GccTriple() string {
|
||||
}
|
||||
|
||||
func (t *toolchainMips) GccVersion() string {
|
||||
return "${mipsGccVersion}"
|
||||
return mipsGccVersion
|
||||
}
|
||||
|
||||
func (t *toolchainMips) ToolchainLdflags() string {
|
||||
|
Reference in New Issue
Block a user