ICU-20435 Fix parallel builds with Cygwin to 3.x
diff --git a/.appveyor.yml b/.appveyor.yml
index e77aac3..1dffa74 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -66,8 +66,7 @@
- "%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 1b09a5b..3e457d5 100644
--- a/icu4c/source/config/mh-cygwin
+++ b/icu4c/source/config/mh-cygwin
@@ -105,7 +105,7 @@
#%$(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 0eee473..4aa2505 100644
--- a/icu4c/source/config/mh-cygwin64
+++ b/icu4c/source/config/mh-cygwin64
@@ -105,7 +105,7 @@
#%$(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)
