Support Windows IncludeFlags am: d352edf0e8 am: c7dac05abc

am: 5c13a4b7b6

* commit '5c13a4b7b6f9cc6910b930a953726e0428be079e':
  Support Windows IncludeFlags

Change-Id: Iebe4f1b96d0407d270bb8037d8223f7a4177f8cb
This commit is contained in:
Dan Willemsen
2016-05-19 01:29:12 +00:00
committed by android-build-merger

View File

@@ -51,8 +51,8 @@ var (
}
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 @@ func init() {
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 *toolchainWindowsX8664) Ldflags() string {
}
func (t *toolchainWindows) IncludeFlags() string {
return ""
return "${windowsIncludeFlags}"
}
func (t *toolchainWindows) ClangSupported() bool {