From 61d4611685b19e82f4edf76c15f2802af8b5b9cb Mon Sep 17 00:00:00 2001 From: Greg Hartman Date: Wed, 4 Oct 2017 17:31:43 -0700 Subject: Use correct flags for host-side assembly BUG: 67434336 Test: Built libjpeg-turbo, confirmed flags Change-Id: I54c1cc968d0a08d3a221ef4c46f2572269420c6a Merged-In: I54c1cc968d0a08d3a221ef4c46f2572269420c6a (cherry picked from commit 09302bee385cafdf182e9dc1242d753025f617d4) --- cc/config/x86_darwin_host.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'cc/config/x86_darwin_host.go') diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go index 65fa1edd..bb751feb 100644 --- a/cc/config/x86_darwin_host.go +++ b/cc/config/x86_darwin_host.go @@ -159,6 +159,8 @@ func init() { strings.Join(ClangFilterUnknownCflags(darwinX8664Cflags), " ")) pctx.StaticVariable("DarwinX86ClangLdflags", strings.Join(darwinX86ClangLdflags, " ")) 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) { @@ -276,6 +278,14 @@ func (t *toolchainDarwinX8664) ClangLdflags() string { 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 { return ".dylib" } -- cgit v1.2.3