diff options
| author | Michael Soegtrop | 2019-07-17 17:03:46 +0200 |
|---|---|---|
| committer | Michael Soegtrop | 2019-07-17 17:11:41 +0200 |
| commit | d796a830f9b566f2a18bf00f364eb9b8cb235f6e (patch) | |
| tree | 65be2bc6e32dae08dc80985419b1634a51710ef8 | |
| parent | 72d93ff7ea837b2d70dfff0ef3fe90749609e1be (diff) | |
Make windows build fail immediately if plugin patches fail
| -rwxr-xr-x | dev/build/windows/makecoq_mingw.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh index 98a5fd0a12..0c8213b8f5 100755 --- a/dev/build/windows/makecoq_mingw.sh +++ b/dev/build/windows/makecoq_mingw.sh @@ -315,7 +315,7 @@ function get_expand_source_tar { find "$(ls)" -mindepth 1 -maxdepth 1 -exec mv -- "{}" . \; else echo "Unzip strip count not supported" - return 1 + exit 1 fi else logn untar tar xvaf "$TARBALLS/$name.$3" --strip $strip @@ -323,10 +323,11 @@ function get_expand_source_tar { # Patch if patch file exists # First try specific patch file name then generic patch file name + # Note: set -o errexit does not work inside a function called in an if, so exit explicity. if [ -f "$PATCHES/$name.patch" ] ; then - log1 patch -p1 -i "$PATCHES/$name.patch" + log1 patch -p1 -i "$PATCHES/$name.patch" || exit 1 elif [ -f "$PATCHES/$basename.patch" ] ; then - log1 patch -p1 -i "$PATCHES/$basename.patch" + log1 patch -p1 -i "$PATCHES/$basename.patch" || exit 1 fi # Go back to base folder |