diff options
| author | David Tardon <dtardon@redhat.com> | 2014-07-21 15:32:37 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-07-21 16:37:14 +0200 |
| commit | 6831ae4d0e0b69e4f06c2987c3be748c8f35c9d8 (patch) | |
| tree | e854884531f4f9d9838f92770fa97445377ff9d5 /external/libxml2 | |
| parent | acd2c90978052723475a41144dd5d92090fbf6b4 (diff) | |
fix debug build of libxml2 on windows, version 2
Change-Id: I67f269e316906913b1a9b4d91907d95b869ca71f
Diffstat (limited to 'external/libxml2')
| -rw-r--r-- | external/libxml2/ExternalProject_xml2.mk | 2 | ||||
| -rw-r--r-- | external/libxml2/libxml2-icu.patch.0 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index cb23686430d4..f19cb529add7 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_use_external_project,xml2,icu) $(call gb_ExternalProject_get_state_target,xml2,build): $(call gb_ExternalProject_run,build,\ cscript configure.js \ - iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index a0ab10424642..4db9f9b6b083 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -22,7 +22,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc !endif !if "$(WITH_ICU)" == "1" -LIBS = $(LIBS) icu.lib -+!if "$(DEBUG)" != "" ++!if "$(WITH_RUN_DEBUG)" == "1" +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib +!else +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib |