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

Merge "Use correct flags for host-side assembly"

Browse Source
This commit is contained in:
Treehugger Robot
2017-10-06 11:48:24 +00:00
committed by Gerrit Code Review
parent ac1c64e2f3 09302bee38
commit c7ba6a2e46
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/config/x86_darwin_host.go
View File

@@ -159,6 +159,8 @@ func init() {
strings.Join(ClangFilterUnknownCflags(darwinX8664Cflags), " ")) strings.Join(ClangFilterUnknownCflags(darwinX8664Cflags), " "))
pctx.StaticVariable("DarwinX86ClangLdflags", strings.Join(darwinX86ClangLdflags, " ")) pctx.StaticVariable("DarwinX86ClangLdflags", strings.Join(darwinX86ClangLdflags, " "))
pctx.StaticVariable("DarwinX8664ClangLdflags", strings.Join(darwinX8664ClangLdflags, " ")) pctx.StaticVariable("DarwinX8664ClangLdflags", strings.Join(darwinX8664ClangLdflags, " "))
pctx.StaticVariable("DarwinX86YasmFlags", "-f macho -m x86")
pctx.StaticVariable("DarwinX8664YasmFlags", "-f macho -m amd64")
} }
func xcrun(config android.Config, args ...string) (string, error) { func xcrun(config android.Config, args ...string) (string, error) {
@@ -276,6 +278,14 @@ func (t *toolchainDarwinX8664) ClangLdflags() string {
return "${config.DarwinClangLdflags} ${config.DarwinX8664ClangLdflags}" return "${config.DarwinClangLdflags} ${config.DarwinX8664ClangLdflags}"
} }
func (t *toolchainDarwinX86) YasmFlags() string {
return "${config.DarwinX86YasmFlags}"
}
func (t *toolchainDarwinX8664) YasmFlags() string {
return "${config.DarwinX8664YasmFlags}"
}
func (t *toolchainDarwin) ShlibSuffix() string { func (t *toolchainDarwin) ShlibSuffix() string {
return ".dylib" return ".dylib"
} }

11
cc/config/x86_linux_host.go
View File

@@ -159,6 +159,9 @@ func init() {
pctx.StaticVariable("LinuxX8664ClangLdflags", strings.Join(linuxX8664ClangLdflags, " ")) pctx.StaticVariable("LinuxX8664ClangLdflags", strings.Join(linuxX8664ClangLdflags, " "))
pctx.StaticVariable("LinuxX86ClangCppflags", strings.Join(linuxX86ClangCppflags, " ")) pctx.StaticVariable("LinuxX86ClangCppflags", strings.Join(linuxX86ClangCppflags, " "))
pctx.StaticVariable("LinuxX8664ClangCppflags", strings.Join(linuxX8664ClangCppflags, " ")) pctx.StaticVariable("LinuxX8664ClangCppflags", strings.Join(linuxX8664ClangCppflags, " "))
// Yasm flags
pctx.StaticVariable("LinuxX86YasmFlags", "-f elf32 -m x86")
pctx.StaticVariable("LinuxX8664YasmFlags", "-f elf64 -m amd64")
} }
type toolchainLinux struct { type toolchainLinux struct {
@@ -251,6 +254,14 @@ func (t *toolchainLinuxX8664) ClangLdflags() string {
return "${config.LinuxClangLdflags} ${config.LinuxX8664ClangLdflags}" return "${config.LinuxClangLdflags} ${config.LinuxX8664ClangLdflags}"
} }
func (t *toolchainLinuxX86) YasmFlags() string {
return "${config.LinuxX86YasmFlags}"
}
func (t *toolchainLinuxX8664) YasmFlags() string {
return "${config.LinuxX8664YasmFlags}"
}
func (t *toolchainLinux) AvailableLibraries() []string { func (t *toolchainLinux) AvailableLibraries() []string {
return linuxAvailableLibraries return linuxAvailableLibraries
} }