diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 17:41:07 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 17:41:07 +0000 |
| commit | 88b49f718bcb6fa1aea657ab1d33734c0cd52789 (patch) | |
| tree | ead37a5220721544fa451437594db599ac46047b /build | |
| parent | 56d8fba03ada4f821435d5a3f2a25ba57f07c31e (diff) | |
| download | chromium_src-88b49f718bcb6fa1aea657ab1d33734c0cd52789.zip chromium_src-88b49f718bcb6fa1aea657ab1d33734c0cd52789.tar.gz chromium_src-88b49f718bcb6fa1aea657ab1d33734c0cd52789.tar.bz2 | |
OpenBSD patches for base / split from CR #8275005
base/base.gypi:
- Add native_library_linux.cc to the openbsd build.
- Add '..' to include_dirs so that OS_* definitions are
available in symbolize.cc
base/debug/debugger_posix.cc:
- Add support for figuring out if the process is being
debugged on OpenBSD by sharing some code with Mac.
base/process_util_unittest.cc:
- Disable the OutOfMemoryTest on OpenBSD
base/third_party/symbolize/symbolize.cc:
- Include the correct elf header on OpenBSD
build/linux/system.gyp:
- The dl library is linux only, so only use it there.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8329023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index e8e3287..77c7de1 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -260,7 +260,7 @@ '<!@(<(pkg-config) --libs-only-l gio-2.0)', ], 'conditions': [ - ['linux_link_gsettings==0', { + ['linux_link_gsettings==0 and OS=="linux"', { 'libraries': [ '-ldl', ], @@ -387,11 +387,15 @@ ], }, }, { - 'link_settings': { - 'libraries': [ - '-ldl', - ], - }, + 'conditions': [ + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + '-ldl', + ], + }, + }], + ], }], ], }], |