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
diff --git a/cc/x86_device.go b/cc/x86_device.go
index 8543240..6dfbd6a 100644
--- a/cc/x86_device.go
+++ b/cc/x86_device.go
@@ -95,6 +95,10 @@
}
)
+const (
+ x86GccVersion = "4.9"
+)
+
func init() {
common.RegisterArchFeatures(common.X86, "atom",
"ssse3",
@@ -133,10 +137,10 @@
"popcnt",
"movbe")
- pctx.StaticVariable("x86GccVersion", "4.9")
+ pctx.StaticVariable("x86GccVersion", x86GccVersion)
pctx.StaticVariable("x86GccRoot",
- "prebuilts/gcc/${HostPrebuiltTag}/x86/x86_64-linux-android-${armGccVersion}")
+ "prebuilts/gcc/${HostPrebuiltTag}/x86/x86_64-linux-android-${x86GccVersion}")
pctx.StaticVariable("x86GccTriple", "x86_64-linux-android")
@@ -188,7 +192,7 @@
}
func (t *toolchainX86) GccVersion() string {
- return "${x86GccVersion}"
+ return x86GccVersion
}
func (t *toolchainX86) ToolchainLdflags() string {