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

Support Windows IncludeFlags am: d352edf0e8

Browse Source 
am: c7dac05abc

* commit 'c7dac05abce912136b966cf3e03ca738800f768b':
  Support Windows IncludeFlags

Change-Id: I27bd3db9a35b9aac8dfa0410460eaed1df9db046
This commit is contained in:
Dan Willemsen
2016-05-19 01:26:20 +00:00
committed by android-build-merger
parent 7f14652efe c7dac05abc
commit 5c13a4b7b6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/x86_windows_host.go
View File

@@ -51,8 +51,8 @@ var (
} }
windowsIncludeFlags = []string{ windowsIncludeFlags = []string{
"-I${windowsGccRoot}/${windowsGccTriple}/include", "-isystem ${windowsGccRoot}/${windowsGccTriple}/include",
"-I${windowsGccRoot}/lib/gcc/${windowsGccTriple}/4.8.3/include", "-isystem ${windowsGccRoot}/lib/gcc/${windowsGccTriple}/4.8.3/include",
} }
windowsLdflags = []string{ windowsLdflags = []string{
@@ -95,6 +95,8 @@ func init() {
pctx.StaticVariable("windowsX8664Cflags", strings.Join(windowsX8664Cflags, " ")) pctx.StaticVariable("windowsX8664Cflags", strings.Join(windowsX8664Cflags, " "))
pctx.StaticVariable("windowsX86Ldflags", strings.Join(windowsX86Ldflags, " ")) pctx.StaticVariable("windowsX86Ldflags", strings.Join(windowsX86Ldflags, " "))
pctx.StaticVariable("windowsX8664Ldflags", strings.Join(windowsX8664Ldflags, " ")) pctx.StaticVariable("windowsX8664Ldflags", strings.Join(windowsX8664Ldflags, " "))
pctx.StaticVariable("windowsIncludeFlags", strings.Join(windowsIncludeFlags, " "))
} }
type toolchainWindows struct { type toolchainWindows struct {
@@ -152,7 +154,7 @@ func (t *toolchainWindowsX8664) Ldflags() string {
} }
func (t *toolchainWindows) IncludeFlags() string { func (t *toolchainWindows) IncludeFlags() string {
return "" return "${windowsIncludeFlags}"
} }
func (t *toolchainWindows) ClangSupported() bool { func (t *toolchainWindows) ClangSupported() bool {