StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various host flag updates to match Make

Browse Source 
am: 01fdd3d

* commit '01fdd3d8c1867d71d718ed900ecf41f7f7245d18':
  Various host flag updates to match Make

Change-Id: I24a28b07428d57218d409f63488fe9e8b7e04554
This commit is contained in:
Dan Willemsen
2016-03-30 21:39:22 +00:00
committed by android-build-merger
parent d75c1887e5 01fdd3d8c1
commit 1e43a62119
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cc/x86_darwin_host.go
View File

@@ -72,6 +72,10 @@ var (
"-fstack-protector-strong",
}...)
darwinX86ClangCflags = append(clangFilterUnknownCflags(darwinX86Cflags), []string{
"-msse3",
}...)
darwinClangLdflags = clangFilterUnknownCflags(darwinLdflags)
darwinX86ClangLdflags = clangFilterUnknownCflags(darwinX86Ldflags)
@@ -126,8 +130,7 @@ func init() {
pctx.StaticVariable("darwinX86Ldflags", strings.Join(darwinX86Ldflags, " "))
pctx.StaticVariable("darwinX8664Ldflags", strings.Join(darwinX8664Ldflags, " "))
pctx.StaticVariable("darwinX86ClangCflags",
strings.Join(clangFilterUnknownCflags(darwinX86Cflags), " "))
pctx.StaticVariable("darwinX86ClangCflags", strings.Join(darwinX86ClangCflags, " "))
pctx.StaticVariable("darwinX8664ClangCflags",
strings.Join(clangFilterUnknownCflags(darwinX8664Cflags), " "))
pctx.StaticVariable("darwinX86ClangLdflags", strings.Join(darwinX86ClangLdflags, " "))
@@ -215,7 +218,7 @@ func (t *toolchainDarwin) IncludeFlags() string {
}
func (t *toolchainDarwinX86) ClangTriple() string {
return "i686-darwin-gnu"
return "i686-apple-darwin"
}
func (t *toolchainDarwinX86) ClangCflags() string {
@@ -223,7 +226,7 @@ func (t *toolchainDarwinX86) ClangCflags() string {
}
func (t *toolchainDarwinX8664) ClangTriple() string {
return "x86_64-darwin-gnu"
return "x86_64-apple-darwin"
}
func (t *toolchainDarwinX8664) ClangCflags() string {

5
cc/x86_linux_host.go
View File

@@ -68,13 +68,14 @@ var (
linuxClangCflags = append(clangFilterUnknownCflags(linuxCflags), []string{
"--gcc-toolchain=${linuxGccRoot}",
"--sysroot=${linuxGccRoot}/sysroot",
"--sysroot ${linuxGccRoot}/sysroot",
"-fstack-protector-strong",
}...)
linuxClangLdflags = append(clangFilterUnknownCflags(linuxLdflags), []string{
"--gcc-toolchain=${linuxGccRoot}",
"--sysroot=${linuxGccRoot}/sysroot",
"--sysroot ${linuxGccRoot}/sysroot",
"-B${linuxGccRoot}/${linuxGccTriple}/bin",
}...)
linuxX86ClangLdflags = append(clangFilterUnknownCflags(linuxX86Ldflags), []string{

10
cc/x86_windows_host.go
View File

@@ -28,7 +28,6 @@ var (
"-DUSE_MINGW",
"-DWIN32_LEAN_AND_MEAN",
"-Wno-unused-parameter",
"-m32",
// Workaround differences in inttypes.h between host and target.
//See bug 12708004.
@@ -37,12 +36,14 @@ var (
// Use C99-compliant printf functions (%zd).
"-D__USE_MINGW_ANSI_STDIO=1",
// Admit to using >= Win2K. Both are needed because of <_mingw.h>.
"-D_WIN32_WINNT=0x0500",
"-DWINVER=0x0500",
// Admit to using >= Vista. Both are needed because of <_mingw.h>.
"-D_WIN32_WINNT=0x0600",
"-DWINVER=0x0600",
// Get 64-bit off_t and related functions.
"-D_FILE_OFFSET_BITS=64",
"--sysroot ${windowsGccRoot}/${windowsGccTriple}",
// HOST_RELEASE_CFLAGS
"-O2", // from build/core/combo/select.mk
"-g", // from build/core/combo/select.mk
@@ -55,7 +56,6 @@ var (
}
windowsLdflags = []string{
"-L${windowsGccRoot}/${windowsGccTriple}",
"--enable-stdcall-fixup",
}