Commit 39b2ef6f authored by brettw@chromium.org's avatar brettw@chromium.org

Make GN run when doing 32-bit cross-compiles on Linux.

Previously, the breakpad client target wasn't getting compiled.

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/462813005

Cr-Commit-Position: refs/heads/master@{#289063}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289063 0039d316-1c4b-4281-b951-d872f2087c98
parent 6a24a039
...@@ -324,61 +324,64 @@ if (is_linux || is_android) { ...@@ -324,61 +324,64 @@ if (is_linux || is_android) {
} }
} }
if (is_linux && current_toolchain == host_toolchain) { if (is_linux) {
executable("dump_syms") { if (current_toolchain == host_toolchain) {
sources = [ # dump_syms is a host tool, so only compile it for the host system.
"src/common/dwarf/bytereader.cc", executable("dump_syms") {
"src/common/dwarf_cfi_to_module.cc", sources = [
"src/common/dwarf_cfi_to_module.h", "src/common/dwarf/bytereader.cc",
"src/common/dwarf_cu_to_module.cc", "src/common/dwarf_cfi_to_module.cc",
"src/common/dwarf_cu_to_module.h", "src/common/dwarf_cfi_to_module.h",
"src/common/dwarf/dwarf2diehandler.cc", "src/common/dwarf_cu_to_module.cc",
"src/common/dwarf/dwarf2reader.cc", "src/common/dwarf_cu_to_module.h",
"src/common/dwarf_line_to_module.cc", "src/common/dwarf/dwarf2diehandler.cc",
"src/common/dwarf_line_to_module.h", "src/common/dwarf/dwarf2reader.cc",
"src/common/language.cc", "src/common/dwarf_line_to_module.cc",
"src/common/language.h", "src/common/dwarf_line_to_module.h",
"src/common/linux/crc32.cc", "src/common/language.cc",
"src/common/linux/crc32.h", "src/common/language.h",
"src/common/linux/dump_symbols.cc", "src/common/linux/crc32.cc",
"src/common/linux/dump_symbols.h", "src/common/linux/crc32.h",
"src/common/linux/elf_symbols_to_module.cc", "src/common/linux/dump_symbols.cc",
"src/common/linux/elf_symbols_to_module.h", "src/common/linux/dump_symbols.h",
"src/common/linux/elfutils.cc", "src/common/linux/elf_symbols_to_module.cc",
"src/common/linux/elfutils.h", "src/common/linux/elf_symbols_to_module.h",
"src/common/linux/file_id.cc", "src/common/linux/elfutils.cc",
"src/common/linux/file_id.h", "src/common/linux/elfutils.h",
"src/common/linux/linux_libc_support.cc", "src/common/linux/file_id.cc",
"src/common/linux/linux_libc_support.h", "src/common/linux/file_id.h",
"src/common/linux/memory_mapped_file.cc", "src/common/linux/linux_libc_support.cc",
"src/common/linux/memory_mapped_file.h", "src/common/linux/linux_libc_support.h",
"src/common/linux/guid_creator.h", "src/common/linux/memory_mapped_file.cc",
"src/common/module.cc", "src/common/linux/memory_mapped_file.h",
"src/common/module.h", "src/common/linux/guid_creator.h",
"src/common/stabs_reader.cc", "src/common/module.cc",
"src/common/stabs_reader.h", "src/common/module.h",
"src/common/stabs_to_module.cc", "src/common/stabs_reader.cc",
"src/common/stabs_to_module.h", "src/common/stabs_reader.h",
"src/tools/linux/dump_syms/dump_syms.cc", "src/common/stabs_to_module.cc",
] "src/common/stabs_to_module.h",
"src/tools/linux/dump_syms/dump_syms.cc",
# There are some warnings in this code. ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] # There are some warnings in this code.
configs -= [ "//build/config/compiler:chromium_code" ]
# dwarf2reader.cc uses dynamic_cast. Because we don't typically configs += [ "//build/config/compiler:no_chromium_code" ]
# don't support RTTI, we enable it for this single target. Since
# dump_syms doesn't share any object files with anything else, # dwarf2reader.cc uses dynamic_cast. Because we don't typically
# this doesn't end up polluting Chrome itself. # don't support RTTI, we enable it for this single target. Since
configs -= [ "//build/config/compiler:no_rtti" ] # dump_syms doesn't share any object files with anything else,
configs += [ "//build/config/compiler:rtti" ] # this doesn't end up polluting Chrome itself.
configs -= [ "//build/config/compiler:no_rtti" ]
# Breakpad rev 583 introduced this flag. configs += [ "//build/config/compiler:rtti" ]
# Using this define, stabs_reader.h will include a.out.h to
# build on Linux. # Breakpad rev 583 introduced this flag.
defines = [ "HAVE_A_OUT_H" ] # Using this define, stabs_reader.h will include a.out.h to
# build on Linux.
include_dirs = [ "src" ] defines = [ "HAVE_A_OUT_H" ]
include_dirs = [ "src" ]
}
} }
static_library("client") { static_library("client") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment