diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-18 16:06:10 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-18 16:51:24 -0700 |
| commit | d352edf0e8c5f838d5d2ae853b673535530e0742 (patch) | |
| tree | de92cc03b47f6df66f4cdabfc9b36312aabb829e /cc | |
| parent | a2abfd6b30e80bf39bcc22b4fee91db37f14fa4a (diff) | |
| download | build_soong-d352edf0e8c5f838d5d2ae853b673535530e0742.tar.gz build_soong-d352edf0e8c5f838d5d2ae853b673535530e0742.tar.bz2 build_soong-d352edf0e8c5f838d5d2ae853b673535530e0742.zip | |
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
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/x86_windows_host.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cc/x86_windows_host.go b/cc/x86_windows_host.go index 34d63c3d..a190b269 100644 --- a/cc/x86_windows_host.go +++ b/cc/x86_windows_host.go @@ -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 { |