aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-01-12 21:51:11 -0800
committerDan Willemsen <dwillemsen@google.com>2016-01-13 13:32:26 -0800
commit6dd0660905ee2236aaee8450d583a3b320505b41 (patch)
treeb1d52346c1b7fce89d2cf6cedf8fafc60f0b1bfc
parent32968a2a480a996c74c79142dba18677e7ef5f5a (diff)
downloadbuild_soong-6dd0660905ee2236aaee8450d583a3b320505b41.tar.gz
build_soong-6dd0660905ee2236aaee8450d583a3b320505b41.tar.bz2
build_soong-6dd0660905ee2236aaee8450d583a3b320505b41.zip
Apply ToolchainLdflags to clang builds
Otherwise we're missing -m32 and -m64 in x86/x86_64 builds. Change-Id: If63cc6ce12795921584437e4cee4530c0dfb634f
-rw-r--r--cc/cc.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/cc.go b/cc/cc.go
index b909cc08..bc486225 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -613,8 +613,8 @@ func (c *CCBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha
flags.GlobalFlags = append(flags.GlobalFlags, toolchain.ToolchainClangCflags())
} else {
flags.GlobalFlags = append(flags.GlobalFlags, toolchain.ToolchainCflags())
- flags.LdFlags = append(flags.LdFlags, toolchain.ToolchainLdflags())
}
+ flags.LdFlags = append(flags.LdFlags, toolchain.ToolchainLdflags())
flags = c.ccModuleType().flags(ctx, flags)