summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authormmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-06 23:45:11 +0000
committermmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-06 23:45:11 +0000
commit78b02d540d5d4ee753b319b4811842273be9d509 (patch)
tree4768a8478bc7183919ea98760846b60422d977ff /build
parent68200ecadb9bf0cbacdf9ee9418be5b16f644b81 (diff)
downloadchromium_src-78b02d540d5d4ee753b319b4811842273be9d509.zip
chromium_src-78b02d540d5d4ee753b319b4811842273be9d509.tar.gz
chromium_src-78b02d540d5d4ee753b319b4811842273be9d509.tar.bz2
Allow third_party/libxslt to compile on Linux. Like libxml, this uses pre-generated configure headers in linux/.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/SConscript.main.linux7
1 files changed, 3 insertions, 4 deletions
diff --git a/build/SConscript.main.linux b/build/SConscript.main.linux
index c41dbe5..a0c8f4d 100644
--- a/build/SConscript.main.linux
+++ b/build/SConscript.main.linux
@@ -79,7 +79,7 @@ env = Environment(
LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg',
LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng',
LIBXML_DIR = '$THIRD_PARTY_DIR/libxml',
- #LIBXSLT_DIR = '$THIRD_PARTY_DIR/libxslt',
+ LIBXSLT_DIR = '$THIRD_PARTY_DIR/libxslt',
LZMA_SDK_DIR = '$THIRD_PARTY_DIR/lzma_sdk',
MODP_B64_DIR = '$THIRD_PARTY_DIR/modp_b64',
#NPAPI_DIR = '$THIRD_PARTY_DIR/npapi',
@@ -361,9 +361,8 @@ if LoadComponent('third_party'):
'$ICU38_DIR/SConscript',
'$LIBJPEG_DIR/SConscript',
'$LIBPNG_DIR/SConscript',
- '$LIBXML_DIR/SConscript',
- # TODO(linux): bring these back.
- #'$LIBXSLT_DIR/SConscript',
+ '$LIBXML_DIR/SConscript',
+ '$LIBXSLT_DIR/SConscript',
'$LZMA_SDK_DIR/SConscript',
'$MODP_B64_DIR/SConscript',
'$ZLIB_DIR/SConscript',