Support Windows IncludeFlags
The variable was defined, but it wasn't being exposed to the Toolchain
interface. It was also using -I instead of -isystem.
Change-Id: Iee9862a4b9c50c9497915175a23864b4b2c29c26
diff --git a/cc/x86_windows_host.go b/cc/x86_windows_host.go
index 34d63c3..a190b26 100644
--- a/cc/x86_windows_host.go
+++ b/cc/x86_windows_host.go
@@ -51,8 +51,8 @@
}
windowsIncludeFlags = []string{
- "-I${windowsGccRoot}/${windowsGccTriple}/include",
- "-I${windowsGccRoot}/lib/gcc/${windowsGccTriple}/4.8.3/include",
+ "-isystem ${windowsGccRoot}/${windowsGccTriple}/include",
+ "-isystem ${windowsGccRoot}/lib/gcc/${windowsGccTriple}/4.8.3/include",
}
windowsLdflags = []string{
@@ -95,6 +95,8 @@
pctx.StaticVariable("windowsX8664Cflags", strings.Join(windowsX8664Cflags, " "))
pctx.StaticVariable("windowsX86Ldflags", strings.Join(windowsX86Ldflags, " "))
pctx.StaticVariable("windowsX8664Ldflags", strings.Join(windowsX8664Ldflags, " "))
+
+ pctx.StaticVariable("windowsIncludeFlags", strings.Join(windowsIncludeFlags, " "))
}
type toolchainWindows struct {
@@ -152,7 +154,7 @@
}
func (t *toolchainWindows) IncludeFlags() string {
- return ""
+ return "${windowsIncludeFlags}"
}
func (t *toolchainWindows) ClangSupported() bool {
