Various host flag updates to match Make
Some of these are updates from the old build system, others are just
differences/bugs being corrected.
Change-Id: Ied7f47ade495dcb26ba3611e636869cba283860f
diff --git a/cc/x86_windows_host.go b/cc/x86_windows_host.go
index ad6fdf3..60d88a1 100644
--- a/cc/x86_windows_host.go
+++ b/cc/x86_windows_host.go
@@ -28,7 +28,6 @@
"-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 @@
// 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 @@
}
windowsLdflags = []string{
- "-L${windowsGccRoot}/${windowsGccTriple}",
"--enable-stdcall-fixup",
}