diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 20:04:06 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 20:04:06 +0000 |
commit | c51e8d50a9314b0580444ed93640b7ae1a2433b8 (patch) | |
tree | bd5cc97d132f87af4d9f345bec703c0d5a7de79a /build/all.gyp | |
parent | f49ea7d24815992ec9484aaf7545e37753bbf727 (diff) | |
download | chromium_src-c51e8d50a9314b0580444ed93640b7ae1a2433b8.zip chromium_src-c51e8d50a9314b0580444ed93640b7ae1a2433b8.tar.gz chromium_src-c51e8d50a9314b0580444ed93640b7ae1a2433b8.tar.bz2 |
Changes to build/ from a combination of FreeBSD and OpenBSD patches.
Review URL: http://codereview.chromium.org/491053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
-rw-r--r-- | build/all.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index dda74fd..28dc607 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -71,9 +71,6 @@ '../breakpad/breakpad.gyp:*', '../courgette/courgette.gyp:*', '../sandbox/sandbox.gyp:*', - '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', - '../tools/xdisplaycheck/xdisplaycheck.gyp:*', - '../net/third_party/nss/nss.gyp:*', ], 'conditions': [ ['branding=="Chrome"', { @@ -83,6 +80,13 @@ }], ], }], + ['OS=="linux" or OS=="freebsd"', { + 'dependencies': [ + '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', + '../tools/xdisplaycheck/xdisplaycheck.gyp:*', + '../net/third_party/nss/nss.gyp:*', + ], + }], ['OS=="win"', { 'conditions': [ ['win_use_allocator_shim==1', { |