aboutsummaryrefslogtreecommitdiffstats
path: root/cc/x86_linux_host.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-06-01 17:09:44 -0700
committerColin Cross <ccross@android.com>2016-06-02 17:37:02 -0700
commit54c7112c4325426eabda5fa96a8d3c4f61cb8cc7 (patch)
treebc8a80430fa87b0f772e04430f2c96dcd4a85482 /cc/x86_linux_host.go
parent0fda89f4a80223d0adb01e0f44a0575c83956ea0 (diff)
downloadbuild_soong-54c7112c4325426eabda5fa96a8d3c4f61cb8cc7.tar.gz
build_soong-54c7112c4325426eabda5fa96a8d3c4f61cb8cc7.tar.bz2
build_soong-54c7112c4325426eabda5fa96a8d3c4f61cb8cc7.zip
Simplify arch target handling
Soong's multi-architecture building has grown complex, with the combination of HostOrDevice+HostType+Arch necessary to determine how to build a variant of a module, and three separate mutators to split each into its variations. Combine HostOrDevice+HostType into Os, which will be Linux, Darwin, Windows, or Android. Store Os+Arch as a single Target. Change-Id: Iae677eff61a851b65a7192a47f2dc17c1abb4160
Diffstat (limited to 'cc/x86_linux_host.go')
-rw-r--r--cc/x86_linux_host.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/x86_linux_host.go b/cc/x86_linux_host.go
index a75de900..b2d84625 100644
--- a/cc/x86_linux_host.go
+++ b/cc/x86_linux_host.go
@@ -254,6 +254,6 @@ func linuxX8664ToolchainFactory(arch android.Arch) Toolchain {
}
func init() {
- registerHostToolchainFactory(android.Linux, android.X86, linuxX86ToolchainFactory)
- registerHostToolchainFactory(android.Linux, android.X86_64, linuxX8664ToolchainFactory)
+ registerToolchainFactory(android.Linux, android.X86, linuxX86ToolchainFactory)
+ registerToolchainFactory(android.Linux, android.X86_64, linuxX8664ToolchainFactory)
}