diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 18:23:03 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 18:23:03 +0000 |
| commit | dd5e829ccd6f29b134b336603fd85edd0dd81269 (patch) | |
| tree | da0e69050ed77a30ba7316d5b688ac2278952d36 /third_party/libxml | |
| parent | 93755a629ab144365e6865bb631356064aafded3 (diff) | |
| download | chromium_src-dd5e829ccd6f29b134b336603fd85edd0dd81269.zip chromium_src-dd5e829ccd6f29b134b336603fd85edd0dd81269.tar.gz chromium_src-dd5e829ccd6f29b134b336603fd85edd0dd81269.tar.bz2 | |
Use separate *_dummy.cc files to force xmlcatalog and xmllint to be
linked with g++ instead of gcc.
BUG=none
TEST=build without warnings
Review URL: http://codereview.chromium.org/202046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml')
| -rw-r--r-- | third_party/libxml/libxml.gyp | 4 | ||||
| -rw-r--r-- | third_party/libxml/xmlcatalog_dummy.cc | 2 | ||||
| -rw-r--r-- | third_party/libxml/xmldummy_mac.cc | 2 | ||||
| -rw-r--r-- | third_party/libxml/xmllint_dummy.cc | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 16f49d8..4d154bc9 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -189,7 +189,7 @@ 'type': 'executable', 'sources': [ 'xmlcatalog.c', - 'xmldummy_mac.cc', + 'xmlcatalog_dummy.cc', ], 'include_dirs': [ '<(os_include)', @@ -213,7 +213,7 @@ 'type': 'executable', 'sources': [ 'xmllint.c', - 'xmldummy_mac.cc', + 'xmllint_dummy.cc', ], 'include_dirs': [ '<(os_include)', diff --git a/third_party/libxml/xmlcatalog_dummy.cc b/third_party/libxml/xmlcatalog_dummy.cc new file mode 100644 index 0000000..7659bb7 --- /dev/null +++ b/third_party/libxml/xmlcatalog_dummy.cc @@ -0,0 +1,2 @@ +// This is a dummy C++ file to force Xcode and SCons to use +// g++ instead of gcc when linking xmlcatalog. diff --git a/third_party/libxml/xmldummy_mac.cc b/third_party/libxml/xmldummy_mac.cc deleted file mode 100644 index 181fd34..0000000 --- a/third_party/libxml/xmldummy_mac.cc +++ /dev/null @@ -1,2 +0,0 @@ -// This is a dummy file to work around an Xcode bug and to force Xcode to use -// g++ instead of gcc when linking xmllint and xmlcatalog. diff --git a/third_party/libxml/xmllint_dummy.cc b/third_party/libxml/xmllint_dummy.cc new file mode 100644 index 0000000..7a1848d --- /dev/null +++ b/third_party/libxml/xmllint_dummy.cc @@ -0,0 +1,2 @@ +// This is a dummy C++ file to force Xcode and SCons to use +// g++ instead of gcc when linking xmllint. |