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

Remove GCC-specific toolchain methods

Browse Source 
Test: m
Change-Id: I06442347ade2d60bc42131b3126ecc17840c9e31
This commit is contained in:
Dan Willemsen
2018-10-07 21:06:36 -07:00
parent 6afcd9aab9
commit bd4abf5dfc
12 changed files with 14 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cc/config/x86_windows_host.go
View File

@@ -137,19 +137,11 @@ func init() {
pctx.StaticVariable("WindowsGccTriple", "x86_64-w64-mingw32")
pctx.StaticVariable("WindowsCflags", strings.Join(windowsCflags, " "))
pctx.StaticVariable("WindowsLdflags", strings.Join(windowsLdflags, " "))
pctx.StaticVariable("WindowsClangCflags", strings.Join(windowsClangCflags, " "))
pctx.StaticVariable("WindowsClangLdflags", strings.Join(windowsClangLdflags, " "))
pctx.StaticVariable("WindowsClangLldflags", strings.Join(windowsClangLldflags, " "))
pctx.StaticVariable("WindowsClangCppflags", strings.Join(windowsClangCppflags, " "))
pctx.StaticVariable("WindowsX86Cflags", strings.Join(windowsX86Cflags, " "))
pctx.StaticVariable("WindowsX8664Cflags", strings.Join(windowsX8664Cflags, " "))
pctx.StaticVariable("WindowsX86Ldflags", strings.Join(windowsX86Ldflags, " "))
pctx.StaticVariable("WindowsX8664Ldflags", strings.Join(windowsX8664Ldflags, " "))
pctx.StaticVariable("WindowsX86ClangCflags",
strings.Join(ClangFilterUnknownCflags(windowsX86Cflags), " "))
pctx.StaticVariable("WindowsX8664ClangCflags",
@@ -198,26 +190,6 @@ func (t *toolchainWindows) GccVersion() string {
return windowsGccVersion
}
func (t *toolchainWindowsX86) Cflags() string {
return "${config.WindowsCflags} ${config.WindowsX86Cflags}"
}
func (t *toolchainWindowsX8664) Cflags() string {
return "${config.WindowsCflags} ${config.WindowsX8664Cflags}"
}
func (t *toolchainWindows) Cppflags() string {
return ""
}
func (t *toolchainWindowsX86) Ldflags() string {
return "${config.WindowsLdflags} ${config.WindowsX86Ldflags}"
}
func (t *toolchainWindowsX8664) Ldflags() string {
return "${config.WindowsLdflags} ${config.WindowsX8664Ldflags}"
}
func (t *toolchainWindows) IncludeFlags() string {
return "${config.WindowsIncludeFlags}"
}