diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-01 12:24:41 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-23 21:59:19 +0200 |
| commit | a4445e397c2a9e25b761bd98ef7d7f2030c48822 (patch) | |
| tree | c26c0954f5be620081a79216cf417ab656e2a102 | |
| parent | b533481ca47bf375c3d63aa59f82e1bdca71d8a5 (diff) | |
external/icu: Don't hardcode cl (so we can build with clang-cl instead)
Change-Id: I8e75b0ab2439592316fc0d871280a438e3ae2f1c
(cherry picked from commit abe87fdfe766a9ec0ab9a5b844bc7a400cfe5b2f)
(cherry picked from commit 9618577152eefe69e4b3f24458e63c46fd8da834)
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/clang-cl.patch.0 | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index ad28fcea0746..c48d02556d2d 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-icu11100.patch.1 \ external/icu/icu4c-scriptrun.patch \ external/icu/rtti.patch.0 \ + external/icu/clang-cl.patch.0 \ $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \ $(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \ )) diff --git a/external/icu/clang-cl.patch.0 b/external/icu/clang-cl.patch.0 new file mode 100644 index 000000000000..cef630cc14b8 --- /dev/null +++ b/external/icu/clang-cl.patch.0 @@ -0,0 +1,13 @@ +--- source/runConfigureICU ++++ source/runConfigureICU +@@ -259,8 +259,8 @@ + Cygwin/MSVC) + THE_OS="Windows with Cygwin" + THE_COMP="Microsoft Visual C++" +- CC=cl; export CC +- CXX=cl; export CXX ++ CC=${CC-cl}; export CC ++ CXX=${CXX-cl}; export CXX + RELEASE_CFLAGS='-Gy -MD' + RELEASE_CXXFLAGS='-Gy -MD' + DEBUG_CFLAGS='-Zi -MDd' |