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

Merge "Add flags for Windows assembly builds"

Browse Source
This commit is contained in:
Jerome Gaillard
2018-11-30 12:30:06 +00:00
committed by Gerrit Code Review
parent 6641b97d13 80fec097b1
commit ba0653cdb4
1 changed files with 11 additions and 0 deletions
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"
} }