diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-11 21:26:10 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-11 21:26:10 +0000 |
| commit | 0396692033fc9342f30e7723c5697a52d09524a6 (patch) | |
| tree | 50de623df45577f5eb096265ee510fabf89b8e45 /breakpad | |
| parent | ff09fdf2aa98f5e4fe9a240e73ebc10844dc3709 (diff) | |
| download | chromium_src-0396692033fc9342f30e7723c5697a52d09524a6.zip chromium_src-0396692033fc9342f30e7723c5697a52d09524a6.tar.gz chromium_src-0396692033fc9342f30e7723c5697a52d09524a6.tar.bz2 | |
Always build breakpad tools with Linux official build.
This removes the need for separate build runs with different hammer flags (e.g.
--mode=Tool).
Review URL: http://codereview.chromium.org/125009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'breakpad')
| -rw-r--r-- | breakpad/breakpad.gyp | 92 |
1 files changed, 55 insertions, 37 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index a60c5de..7fac254 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -210,6 +210,61 @@ ], }], [ 'OS=="linux"', { + 'conditions': [ + # Tools needed for archiving official build symbols. + ['branding=="Chrome"', { + 'targets': [ + { + 'target_name': 'symupload', + 'type': 'executable', + + # This uses the system libcurl, so don't use the default 32-bit + # compile flags when building on a 64-bit machine. + 'variables': { + 'host_arch': '<!(uname -m)', + }, + 'conditions': [ + ['host_arch=="x86_64"', { + 'cflags!': ['-m32', '-march=pentium4', '-msse2', + '-mfpmath=sse'], + 'ldflags!': ['-m32'], + 'cflags': ['-O2'], + }], + ], + + 'sources': [ + 'src/tools/linux/symupload/sym_upload.cc', + 'src/common/linux/http_upload.cc', + ], + 'include_dirs': [ + 'src', + ], + 'link_settings': { + 'libraries': [ + '-ldl', + ], + }, + }, + { + 'target_name': 'dump_syms', + 'type': 'executable', + + 'sources': [ + 'linux/dump_syms.cc', + 'linux/dump_symbols.cc', + 'linux/dump_symbols.h', + 'linux/file_id.cc', + 'linux/file_id.h', + ], + + 'include_dirs': [ + 'src', + '..', + ], + }, + ], + }], + ], 'targets': [ { 'target_name': 'breakpad_client', @@ -287,43 +342,6 @@ '..', ], }, -# This needs libcurl, which means that it cannot be built with the default -# configuration as we don't have 32-bit libcurl. Uncomment this and use -# BUILDTYPE=Tool to build with the default host config. -# { -# 'target_name': 'symupload', -# 'type': 'executable', -# -# 'sources': [ -# 'src/tools/linux/symupload/sym_upload.cc', -# 'src/common/linux/http_upload.cc', -# ], -# 'include_dirs': [ -# 'src', -# ], -# 'link_settings': { -# 'libraries': [ -# '-ldl', -# ], -# }, -# }, -# { -# 'target_name': 'dump_syms', -# 'type': 'executable', -# -# 'sources': [ -# 'linux/dump_syms.cc', -# 'linux/dump_symbols.cc', -# 'linux/dump_symbols.h', -# 'linux/file_id.cc', -# 'linux/file_id.h', -# ], -# -# 'include_dirs': [ -# 'src', -# '..', -# ], -# }, ], }], ], |