summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authormmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-06 18:37:03 +0000
committermmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-06 18:37:03 +0000
commite6d08cad82c6175196682a0730be347d5dddd415 (patch)
tree0e37904d053ce3e28c4e3889079d0cc5e3fee177 /build
parent754e5bc23b758ef3444dd7383822563e46da8405 (diff)
downloadchromium_src-e6d08cad82c6175196682a0730be347d5dddd415.zip
chromium_src-e6d08cad82c6175196682a0730be347d5dddd415.tar.gz
chromium_src-e6d08cad82c6175196682a0730be347d5dddd415.tar.bz2
Allow third_party/libxml to compile on Linux. This uses static config.h and xmlversion.h files generated by ./configure, which probably isn't ideal, but it's a start.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/SConscript.main.linux4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/SConscript.main.linux b/build/SConscript.main.linux
index 95244f1..c41dbe5 100644
--- a/build/SConscript.main.linux
+++ b/build/SConscript.main.linux
@@ -78,7 +78,7 @@ env = Environment(
ICU38_DIR = '$THIRD_PARTY_DIR/icu38',
LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg',
LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng',
- #LIBXML_DIR = '$THIRD_PARTY_DIR/libxml',
+ LIBXML_DIR = '$THIRD_PARTY_DIR/libxml',
#LIBXSLT_DIR = '$THIRD_PARTY_DIR/libxslt',
LZMA_SDK_DIR = '$THIRD_PARTY_DIR/lzma_sdk',
MODP_B64_DIR = '$THIRD_PARTY_DIR/modp_b64',
@@ -361,8 +361,8 @@ if LoadComponent('third_party'):
'$ICU38_DIR/SConscript',
'$LIBJPEG_DIR/SConscript',
'$LIBPNG_DIR/SConscript',
+ '$LIBXML_DIR/SConscript',
# TODO(linux): bring these back.
- #'$LIBXML_DIR/SConscript',
#'$LIBXSLT_DIR/SConscript',
'$LZMA_SDK_DIR/SConscript',
'$MODP_B64_DIR/SConscript',