ICU-20435 Fix parallel builds with Cygwin to 3.x

diff --git a/.appveyor.yml b/.appveyor.yml
index e77aac3ad88a9756a648a1b465bdeb741d1af6e7..1dffa74700dd3196a1f7cafd2092e0cd7788015a 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -66,8 +66,7 @@ for:
       - "%CYG_ROOT%\\bin\\sh -lc 'uname -a'"
 
     build_script:
-      - '%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && cd icu4c/source && ./runConfigureICU Cygwin && make"'
-      - '%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && cd icu4c/source && make -j2 check"'
+      - '%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && cd icu4c/source && ./runConfigureICU Cygwin && make -j2 check"'
 
 #  -
 #    matrix:

diff --git a/icu4c/source/config/mh-cygwin b/icu4c/source/config/mh-cygwin
index 1b09a5bf928d5bc39d683941c6afc70b6da26b78..3e457d53d51b576caae7b3725f945871a00ae0ab 100644 (file)
--- a/icu4c/source/config/mh-cygwin
+++ b/icu4c/source/config/mh-cygwin
@@ -105,7 +105,7 @@ ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
 #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
 #      $(RM) $@ && cp ${<F} $@
 %.$(SO): %$(SO_TARGET_VERSION_MAJOR).$(SO)
-       $(RM) $(subst cyg,lib,$@).$(A) && ln -s $(subst cyg,lib,${<F}).$(A) $(subst cyg,lib,$@).$(A)
+       ln -fs $(subst cyg,lib,${<F}).$(A) $(subst cyg,lib,$@).$(A)
 
 ## Install libraries as executable
 INSTALL-L=$(INSTALL_PROGRAM)

diff --git a/icu4c/source/config/mh-cygwin64 b/icu4c/source/config/mh-cygwin64
index 0eee4736846a0dee69340e4da0f779e0a40a618e..4aa2505f1e770ec22088b4fec89d0a3afc420377 100644 (file)
--- a/icu4c/source/config/mh-cygwin64
+++ b/icu4c/source/config/mh-cygwin64
@@ -105,7 +105,7 @@ ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
 #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
 #      $(RM) $@ && cp ${<F} $@
 %.$(SO): %$(SO_TARGET_VERSION_MAJOR).$(SO)
-       $(RM) $(subst cyg,lib,$@).$(A) && ln -s $(subst cyg,lib,${<F}).$(A) $(subst cyg,lib,$@).$(A)
+       ln -fs $(subst cyg,lib,${<F}).$(A) $(subst cyg,lib,$@).$(A)
 
 ## Install libraries as executable
 INSTALL-L=$(INSTALL_PROGRAM)