Skip to content
Snippets Groups Projects
Commit 38bd9186 authored by evan@chromium.org's avatar evan@chromium.org
Browse files

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
parent 6bb6373d
No related branches found
No related tags found
No related merge requests found
...@@ -11,13 +11,17 @@ ...@@ -11,13 +11,17 @@
['OS=="mac"', {'os_include': 'mac'}], ['OS=="mac"', {'os_include': 'mac'}],
['OS=="win"', {'os_include': 'win32'}], ['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': [ 'targets': [
{ {
'target_name': 'libxslt', 'target_name': 'libxslt',
'conditions': [ 'conditions': [
['OS=="linux" and use_system_libxslt', { ['OS=="linux" and use_system_libxml', {
'type': 'settings', 'type': 'settings',
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
...@@ -32,7 +36,7 @@ ...@@ -32,7 +36,7 @@
'<!@(pkg-config --libs-only-l libxslt)', '<!@(pkg-config --libs-only-l libxslt)',
], ],
}, },
}, { # else: OS != "linux" or ! use_system_libxslt }, { # else: OS != "linux" or ! use_system_libxml
'type': '<(library)', 'type': '<(library)',
'msvs_guid': 'FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED', 'msvs_guid': 'FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED',
'sources': [ 'sources': [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment