summaryrefslogtreecommitdiffstats
path: root/build/SConscript.main
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 00:10:38 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 00:10:38 +0000
commitdab8619b4848bb10dfe78a3f0c59d6e661ec9610 (patch)
tree187818b2b685f5545832b45bbd20d01b53aca6d5 /build/SConscript.main
parent0fe41aecdbfd97633bda1a892b2f3efb60f1d3ed (diff)
downloadchromium_src-dab8619b4848bb10dfe78a3f0c59d6e661ec9610.zip
chromium_src-dab8619b4848bb10dfe78a3f0c59d6e661ec9610.tar.gz
chromium_src-dab8619b4848bb10dfe78a3f0c59d6e661ec9610.tar.bz2
Make tcp_client_socket_unittest pass on Linux.
Requires another changeset that puts libevent in third_party; I'll upload that next. This is not the final word; it makes too many syscalls per read. But it's a start. Review URL: http://codereview.chromium.org/3202 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.main')
-rw-r--r--build/SConscript.main5
1 files changed, 5 insertions, 0 deletions
diff --git a/build/SConscript.main b/build/SConscript.main
index 25b8fec..df6e80d 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -63,6 +63,7 @@ env = Environment(
BSPATCH_DIR = '$THIRD_PARTY_DIR/bspatch',
BZIP2_DIR = '$THIRD_PARTY_DIR/bzip2',
ICU38_DIR = '$THIRD_PARTY_DIR/icu38',
+ LIBEVENT_DIR = '$THIRD_PARTY_DIR/libevent',
LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg',
LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng',
LIBXML_DIR = '$THIRD_PARTY_DIR/libxml',
@@ -500,6 +501,10 @@ if LoadComponent('third_party'):
'$LIBXML_DIR/SConscript',
'$LIBXSLT_DIR/SConscript',
])
+ if env['PLATFORM'] == 'posix':
+ sconscripts.extend([
+ '$LIBEVENT_DIR/SConscript',
+ ])
# This is temporary until we get this lib to build on other platforms.
if env['PLATFORM'] == 'win32':
sconscripts.extend([