diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-01 13:02:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-23 21:59:28 +0200 |
| commit | d81df8913ecf92413321884f0f82a623f2ffaa01 (patch) | |
| tree | 82f4c29498d8c988e865bab5ed1da659695e99c3 | |
| parent | a4445e397c2a9e25b761bd98ef7d7f2030c48822 (diff) | |
external/icu: Work around a weird Windows bug in either make or clang-cl
...for now; workdir/UnpackedTarball/icu/source/tools/toolutil/Makefile invokes
the compiler with a -DU_HOST=\"...\" argument, and apparently directly executes
the compiler from CreateProcess, not going via a shell invocation for the recipe
line. This confuses clang-cl for whatever reason, and for whatever other
reason, forcing make to go via a shell invocation (by adding "true &&" into the
recipe line) fixes it.
Change-Id: I3757a8856f93228c19475b37f3037fa9519a426f
(cherry picked from commit fea70bfb0624e4aa57bb8e4f1c229188b061f5d2)
(cherry picked from commit 088f782691cd178e875ff6b500557a6219cccfa1)
| -rw-r--r-- | external/icu/clang-cl.patch.0 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/external/icu/clang-cl.patch.0 b/external/icu/clang-cl.patch.0 index cef630cc14b8..4df5d0f56c83 100644 --- a/external/icu/clang-cl.patch.0 +++ b/external/icu/clang-cl.patch.0 @@ -1,3 +1,16 @@ +--- source/config/mh-cygwin-msvc ++++ source/config/mh-cygwin-msvc +@@ -51,8 +51,8 @@ + LDFLAGS+=-nologo + + # Commands to compile +-COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c ++COMPILE.c= true && $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c +-COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c ++COMPILE.cc= true && $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c + + # Commands to link + LINK.c= LINK.EXE -subsystem:console $(LDFLAGS) --- source/runConfigureICU +++ source/runConfigureICU @@ -259,8 +259,8 @@ |