tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add flags for Windows assembly builds" am: ba0653cdb4

Browse source 
am: dacb269342

Change-Id: Iea9ad5904ffb2eef10354faf1989e8239fd0c552
This commit is contained in:
Jerome Gaillard 2018-11-30 04:47:39 -08:00 committed by android-build-merger
commit 80e1b1250c
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cc/config/x86_windows_host.go
View file

@ -140,6 +140,9 @@ func init() {
pctx.StaticVariable("WindowsX8664ClangCppflags", strings.Join(windowsX8664ClangCppflags, " ")) pctx.StaticVariable("WindowsX8664ClangCppflags", strings.Join(windowsX8664ClangCppflags, " "))
pctx.StaticVariable("WindowsIncludeFlags", strings.Join(windowsIncludeFlags, " ")) pctx.StaticVariable("WindowsIncludeFlags", strings.Join(windowsIncludeFlags, " "))
// Yasm flags
pctx.StaticVariable("WindowsX86YasmFlags", "-f win32 -m x86")
pctx.StaticVariable("WindowsX8664YasmFlags", "-f win64 -m amd64")
} }
type toolchainWindows struct { type toolchainWindows struct {
@ -228,6 +231,14 @@ func (t *toolchainWindowsX8664) ClangLldflags() string {
return "${config.WindowsClangLldflags} ${config.WindowsX8664ClangLldflags}" return "${config.WindowsClangLldflags} ${config.WindowsX8664ClangLldflags}"
} }
func (t *toolchainWindowsX86) YasmFlags() string {
return "${config.WindowsX86YasmFlags}"
}
func (t *toolchainWindowsX8664) YasmFlags() string {
return "${config.WindowsX8664YasmFlags}"
}
func (t *toolchainWindows) ShlibSuffix() string { func (t *toolchainWindows) ShlibSuffix() string {
return ".dll" return ".dll"
} }