Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: third_party/libxslt/libxslt.gyp

Issue 1695019: linux: remove use_system_libxslt (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: retry Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libxslt/libxslt.gyp
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index 7dda86813a7ec332866a8b66b71e026cd8301520..cc6a37743bd221acec169f8c2f6eb4b8b909f677 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': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698