diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2022-10-17 12:25:05 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2022-12-06 15:45:13 +0000 |
| commit | 94f839137cdf007412c7fd13e7279db48baf58fb (patch) | |
| tree | efedfd42b19a49c2e1678957808c46c8774dee96 /tools | |
| parent | b2ba2a2b5d90a7851bc2964c6414083a95a2662f (diff) | |
| download | ocaml-94f839137cdf007412c7fd13e7279db48baf58fb.tar.gz | |
AppVeyor script fixes for Cygwin
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ci/appveyor/appveyor_build.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tools/ci/appveyor/appveyor_build.sh b/tools/ci/appveyor/appveyor_build.sh index cdeaf1b674..3292ad9c31 100644 --- a/tools/ci/appveyor/appveyor_build.sh +++ b/tools/ci/appveyor/appveyor_build.sh @@ -100,13 +100,19 @@ OCAMLROOT=$(echo "$OCAMLROOT" | cygpath -f - -m) if [[ $BOOTSTRAP_FLEXDLL = 'false' ]] ; then case "$PORT" in - cygwin*) ;; - *) export PATH="$FLEXDLLROOT:$PATH";; + cygwin*) + install_flexdll='false';; + *) + export PATH="$FLEXDLLROOT:$PATH" + install_flexdll='true';; esac +else + install_flexdll='false' fi case "$1" in install) + mkdir -p "$CACHE_DIRECTORY" if [ ! -e "$CACHE_DIRECTORY/parallel-source" ] || \ [ "$PARALLEL_URL" != "$(cat "$CACHE_DIRECTORY/parallel-source")" ] ; then # Download latest version directly from the repo @@ -116,7 +122,7 @@ case "$1" in cp "$CACHE_DIRECTORY/parallel" /usr/bin chmod +x /usr/bin/parallel parallel --version - if [[ $BOOTSTRAP_FLEXDLL = 'false' ]] ; then + if [[ $install_flexdll = 'true' ]] ; then mkdir -p "$FLEXDLLROOT" cd "$APPVEYOR_BUILD_FOLDER/../flexdll" # The objects are always built from the sources @@ -180,7 +186,7 @@ case "$1" in run "$MAKE distclean" $MAKE distclean fi - if [[ $BOOTSTRAP_FLEXDLL = 'false' ]] ; then + if [[ $install_flexdll = 'true' ]] ; then tar -xzf "$APPVEYOR_BUILD_FOLDER/flexdll.tar.gz" cd "flexdll-$FLEXDLL_VERSION" $MAKE MSVC_DETECT=0 CHAINS=${PORT%32} support |