Merge "Remove cflags and ldflags from crt defaults"

This commit is contained in:
Colin Cross 2015-11-24 21:33:54 +00:00 committed by Gerrit Code Review
commit a01108d9bf

View File

@ -1946,30 +1946,24 @@ cc_defaults {
arch: { arch: {
arm: { arm: {
local_include_dirs: ["arch-arm/include"], local_include_dirs: ["arch-arm/include"],
cflags: ["-mthumb-interwork"],
}, },
arm64: { arm64: {
local_include_dirs: ["arch-arm64/include"], local_include_dirs: ["arch-arm64/include"],
}, },
mips: { mips: {
local_include_dirs: ["arch-mips/include"], local_include_dirs: ["arch-mips/include"],
ldflags: ["-melf32ltsmip"],
}, },
mips64: { mips64: {
local_include_dirs: ["arch-mips64/include"], local_include_dirs: ["arch-mips64/include"],
ldflags: ["-melf64ltsmip"],
}, },
x86: { x86: {
cflags: ["-m32"],
ldflags: ["-melf_i386"],
local_include_dirs: ["arch-x86/include"], local_include_dirs: ["arch-x86/include"],
}, },
x86_64: { x86_64: {
cflags: ["-m64"],
ldflags: ["-melf_x86_64"],
local_include_dirs: ["arch-x86_64/include"], local_include_dirs: ["arch-x86_64/include"],
}, },
}, },
clang: false,
} }
cc_defaults { cc_defaults {