diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-10 12:17:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-10 12:19:09 +0100 |
| commit | 5386b7633d857ef100aa7022effd0678741fab97 (patch) | |
| tree | 835e6c636d03509fdfda493f39011fd1d760a815 /icu/icu4c-wchar_t.patch | |
| parent | 777bbda955407c56805de3a3f4e96b0c13be6570 (diff) | |
configure icu for windows via runConfigureICU Cygwin/MSVC
which should hopefully
a) work
b) unblock the upgrade path for icu
Change-Id: Ic70a627f3135e53016a4f9cfdef3fc85d55ab3e4
Diffstat (limited to 'icu/icu4c-wchar_t.patch')
| -rw-r--r-- | icu/icu4c-wchar_t.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/icu/icu4c-wchar_t.patch b/icu/icu4c-wchar_t.patch new file mode 100644 index 000000000000..bb788dcaf90a --- /dev/null +++ b/icu/icu4c-wchar_t.patch @@ -0,0 +1,15 @@ +--- misc/icu/source/config/mh-cygwin-msvc 2012-05-10 11:42:22.886869800 +0100 ++++ misc/build/icu/source/config/mh-cygwin-msvc 2012-05-10 11:42:45.110227500 +0100 +@@ -43,10 +43,9 @@ + + # /GF pools strings and places them into read-only memory + # /EHsc enables exception handling +-# /Zc:wchar_t makes wchar_t a native type. Required for C++ ABI compatibility. + # -D_CRT_SECURE_NO_DEPRECATE is needed to quiet warnings about using standard C functions. +-CFLAGS+=/GF /nologo +-CXXFLAGS+=/GF /nologo /EHsc /Zc:wchar_t ++CFLAGS+=/GF /nologo /Zc:wchar_t- ++CXXFLAGS+=/GF /nologo /EHsc /Zc:wchar_t- + CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE + DEFS+=-DWIN32 + DEFS+=-DCYGWINMSVC |