From 01d8849d2f2abe4d9c4d0931af76ee40b8d20e7f Mon Sep 17 00:00:00 2001
From: "zork@chromium.org"
<zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 18 Sep 2009 17:37:55 +0000
Subject: [PATCH] Fix expat.gyp to build on Linux Review URL:
http://codereview.chromium.org/212017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26585 0039d316-1c4b-4281-b951-d872f2087c98
---
third_party/expat/expat.gyp | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp
index 31457f33bced9..001fd5b9c401b 100644
--- a/third_party/expat/expat.gyp
+++ b/third_party/expat/expat.gyp
@@ -9,7 +9,6 @@
'target_defaults': {
'defines': [
'_LIB',
- 'COMPILED_FROM_DSP',
'XML_STATIC', # Compile for static linkage.
],
'include_dirs': [
@@ -40,7 +39,19 @@
'defines': [
'XML_STATIC', # Tell dependants to expect static linkage.
],
- }
+ },
+ 'conditions': [
+ ['OS=="win"', {
+ 'defines': [
+ 'COMPILED_FROM_DSP',
+ ],
+ }],
+ ['OS=="linux"', {
+ 'defines': [
+ 'HAVE_EXPAT_CONFIG_H',
+ ],
+ }],
+ ],
},
],
}
--
GitLab