Reorder extra clang host flags

In make these clang-specific flags are marked as EXTRA and added after
the common flags.

This was causing differences between compiled objects in make and soong
because -fstack-protector-strong was before -fstack-protector in soong
instead of after.

Change-Id: I59dd6dcfdaf5ec9184a09e79efe80b62cfe48dbb
This commit is contained in:
Dan Willemsen 2016-03-03 17:22:39 -08:00
parent be03f346b3
commit f534a10643
2 changed files with 10 additions and 10 deletions

View File

@ -63,10 +63,10 @@ var (
"-Wl,-rpath,@loader_path/lib64",
}
darwinClangCflags = append([]string{
darwinClangCflags = append(clangFilterUnknownCflags(darwinCflags), []string{
"-integrated-as",
"-fstack-protector-strong",
}, clangFilterUnknownCflags(darwinCflags)...)
}...)
darwinClangLdflags = clangFilterUnknownCflags(darwinLdflags)

View File

@ -66,28 +66,28 @@ var (
`-Wl,-rpath,\$$ORIGIN/lib64`,
}
linuxClangCflags = append([]string{
linuxClangCflags = append(clangFilterUnknownCflags(linuxCflags), []string{
"--gcc-toolchain=${linuxGccRoot}",
"--sysroot=${linuxGccRoot}/sysroot",
"-fstack-protector-strong",
}, clangFilterUnknownCflags(linuxCflags)...)
}...)
linuxClangLdflags = append([]string{
linuxClangLdflags = append(clangFilterUnknownCflags(linuxLdflags), []string{
"--gcc-toolchain=${linuxGccRoot}",
"--sysroot=${linuxGccRoot}/sysroot",
}, clangFilterUnknownCflags(linuxLdflags)...)
}...)
linuxX86ClangLdflags = append([]string{
linuxX86ClangLdflags = append(clangFilterUnknownCflags(linuxX86Ldflags), []string{
"-B${linuxGccRoot}/lib/gcc/${linuxGccTriple}/${linuxGccVersion}/32",
"-L${linuxGccRoot}/lib/gcc/${linuxGccTriple}/${linuxGccVersion}/32",
"-L${linuxGccRoot}/${linuxGccTriple}/lib32",
}, clangFilterUnknownCflags(linuxX86Ldflags)...)
}...)
linuxX8664ClangLdflags = append([]string{
linuxX8664ClangLdflags = append(clangFilterUnknownCflags(linuxX8664Ldflags), []string{
"-B${linuxGccRoot}/lib/gcc/${linuxGccTriple}/${linuxGccVersion}",
"-L${linuxGccRoot}/lib/gcc/${linuxGccTriple}/${linuxGccVersion}",
"-L${linuxGccRoot}/${linuxGccTriple}/lib64",
}, clangFilterUnknownCflags(linuxX8664Ldflags)...)
}...)
linuxClangCppflags = []string{
"-isystem ${linuxGccRoot}/${linuxGccTriple}/include/c++/${linuxGccVersion}",