Skip to content

Commit e5b49a0

Browse files
committed
guix: Create windeploy inside distsrc-*
./windeploy is a "working directory", and therefore belongs inside distsrc-*. Many people have noticed their Guix builds failing after hours simply because they did not remove windeploy (but did remove the distsrc-* directories).
1 parent 3e9982a commit e5b49a0

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

contrib/guix/libexec/build.sh

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -394,21 +394,21 @@ mkdir -p "$DISTSRC"
394394
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin18/osx64}.tar.gz" && exit 1 )
395395
;;
396396
esac
397-
)
398-
)
397+
) # $DISTSRC/installed
399398

400-
case "$HOST" in
401-
*mingw*)
402-
cp -rf --target-directory=. contrib/windeploy
403-
(
404-
cd ./windeploy
405-
mkdir unsigned
406-
cp --target-directory=unsigned/ "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
407-
find . -print0 \
408-
| sort --zero-terminated \
409-
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
410-
| gzip -9n > "${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz" \
411-
|| ( rm -f "${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz" && exit 1 )
412-
)
413-
;;
414-
esac
399+
case "$HOST" in
400+
*mingw*)
401+
cp -rf --target-directory=. contrib/windeploy
402+
(
403+
cd ./windeploy
404+
mkdir -p unsigned
405+
cp --target-directory=unsigned/ "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
406+
find . -print0 \
407+
| sort --zero-terminated \
408+
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
409+
| gzip -9n > "${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz" \
410+
|| ( rm -f "${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz" && exit 1 )
411+
)
412+
;;
413+
esac
414+
) # $DISTSRC

0 commit comments

Comments
 (0)