diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 00:52:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 00:52:52 +0000 |
| commit | 38bd9186d45bdb44df28b71e0bfe2ea3bdd6d393 (patch) | |
| tree | 99c16159b48b6370460e078e625e4ab596be5d24 /third_party/libxslt | |
| parent | 6bb6373d4b1567737438d5f048e35765dbfe8553 (diff) | |
| download | chromium_src-38bd9186d45bdb44df28b71e0bfe2ea3bdd6d393.zip chromium_src-38bd9186d45bdb44df28b71e0bfe2ea3bdd6d393.tar.gz chromium_src-38bd9186d45bdb44df28b71e0bfe2ea3bdd6d393.tar.bz2 | |
linux: remove use_system_libxslt, instead use xml flag
We have weird crashes when system_libxslt != system_libxml.
Nobody has diagnosed them. We should just use one flag for both
so people stop reporting problems with it.
BUG=42487
Review URL: http://codereview.chromium.org/1695019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxslt')
| -rw-r--r-- | third_party/libxslt/libxslt.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 7dda868..cc6a377 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -11,13 +11,17 @@ ['OS=="mac"', {'os_include': 'mac'}], ['OS=="win"', {'os_include': 'win32'}], ], - 'use_system_libxslt%': 0, + # We used to have a separate flag for using the system + # libxslt, but it seems mixing Chrome libxml and system + # libxslt causes crashes that nobody has had time to diagnose. + # So just put them both behind the same flag for now. + 'use_system_libxml%': 0, }, 'targets': [ { 'target_name': 'libxslt', 'conditions': [ - ['OS=="linux" and use_system_libxslt', { + ['OS=="linux" and use_system_libxml', { 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ @@ -32,7 +36,7 @@ '<!@(pkg-config --libs-only-l libxslt)', ], }, - }, { # else: OS != "linux" or ! use_system_libxslt + }, { # else: OS != "linux" or ! use_system_libxml 'type': '<(library)', 'msvs_guid': 'FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED', 'sources': [ |