openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ToolchainClangCflags for host bionic 

Move these flags from the normal flags to the toolchain flags, since we
want them to always apply.

Test: Add #ifdef __ANDROID__ to crtbegin.c, check to see if it's set for host bionic
Change-Id: I382dd229e3e4a889bc916f6f8e1248c7debb8fad
This commit is contained in:
Dan Willemsen 2017-09-18 22:50:22 -07:00
parent 6f91fbff76
commit 38394b962f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cc/config/x86_linux_bionic_host.go
View File

@ -54,10 +54,6 @@ var (
// Tell clang where the gcc toolchain is
"--gcc-toolchain=${LinuxBionicGccRoot}",
// TODO: We're not really android, but we don't have a triple yet b/31393676
"-U__ANDROID__",
"-fno-emulated-tls",
// This is normally in ClangExtraTargetCflags, but this is considered host
"-nostdlibinc",
})
@ -142,7 +138,9 @@ func (t *toolchainLinuxBionic) ClangLdflags() string {
}
func (t *toolchainLinuxBionic) ToolchainClangCflags() string {
return "-m64 -march=x86-64"
return "-m64 -march=x86-64" +
// TODO: We're not really android, but we don't have a triple yet b/31393676
" -U__ANDROID__ -fno-emulated-tls"
}
func (t *toolchainLinuxBionic) ToolchainClangLdflags() string {