diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 00:39:40 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 00:39:40 +0000 |
| commit | 35730489299670176b75b2a5c8df898c50533489 (patch) | |
| tree | 927a627e0e7e6cbe1ac1db28f537bb2f2da21229 /third_party | |
| parent | f9db49ddb6f0bc08320241ced98a60a94b2f79c0 (diff) | |
| download | chromium_src-35730489299670176b75b2a5c8df898c50533489.zip chromium_src-35730489299670176b75b2a5c8df898c50533489.tar.gz chromium_src-35730489299670176b75b2a5c8df898c50533489.tar.bz2 | |
Revert 53122 - libxml: LIBXML_STATIC isn't needed on windows either
In my previous patch today, I moved LIBXML_STATIC into a Windows-only
block in the gyp file. It turns out I misread the #defines and it's
not needed on any OS.
libxml.h has this:
#ifndef PIC
# define LIBXML_STATIC
#endif
The PIC define mentioned there appears to be a Linuxism, which is fine
for us because we want it to be static anyway.
Review URL: http://codereview.chromium.org/2825052
TBR=evan@chromium.org
Review URL: http://codereview.chromium.org/3049004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libxml/libxml.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 2b40342..0311df1 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -178,6 +178,11 @@ ['OS=="mac"', {'defines': ['_REENTRANT']}], ['OS=="win"', { 'product_name': 'libxml2', + 'defines': [ + # This symbol prevents libxml from marking its functions with + # __declspec(dllexport). + 'LIBXML_STATIC', + ], }, { # else: OS!="win" 'product_name': 'xml2', }], |