From 19f435dc54d7ada7df43faaf5ba234a700562dfe Mon Sep 17 00:00:00 2001 From: Damien Doligez Date: Tue, 5 Sep 2017 01:08:35 +0200 Subject: [PATCH] cygwin CI: rebase to avoid fork problems --- tools/ci-build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/ci-build b/tools/ci-build index 2700bbdad..7f8ad9cf9 100755 --- a/tools/ci-build +++ b/tools/ci-build @@ -100,6 +100,7 @@ confoptions="${OCAML_CONFIGURE_OPTIONS}" make_native=true cleanup=false check_make_alldepend=false +dorebase=false case "${OCAML_ARCH}" in bsd) make=gmake ;; @@ -111,6 +112,7 @@ case "${OCAML_ARCH}" in cygwin) cleanup=true check_make_alldepend=true + dorebase=true ;; mingw) instdir='C:/ocamlmgw' @@ -209,6 +211,11 @@ if $make_native; then $make opt.opt if $check_make_alldepend; then $make alldepend; fi fi +if $dorebase; then + # temporary solution to the cygwin fork problem + rebase -b 0x7cd20000 otherlibs/unix/dllunix.so + rebase -b 0x7cdc0000 otherlibs/systhreads/dllthreads.so +fi $make install rm -rf "$instdir"