commit 5a3ca06d4d031019aadc0a50aa209a5ca86c2b3f Author: Georg Koppen <gk@torproject.org> Date: Mon Sep 1 09:12:35 2014 +0000 Bug 10077: Make binutils independent of mingw-w64. We might want to bump the binutils version independent of the mingw-w64 version. This does not work anymore if we don't at least touch a binutils related file containing the currently built/used binutils version. --- gitian/descriptors/windows/gitian-utils.yml | 2 ++ gitian/mkbundle-windows.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 2d0b3db..75e5662 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -152,6 +152,8 @@ script: | # Grabbing the remaining results cd $INSTDIR + # We might want to bump binutils independent of bumping mingw-w64. + touch binutils-$BINUTILS_VER-win32-utils.zip ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index dfc326b..595ff29 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -96,7 +96,8 @@ fi cd $GITIAN_DIR -if [ ! -f inputs/gcclibs-$GCC_VER-win32-utils.zip -o \ +if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ + ! -f inputs/gcclibs-$GCC_VER-win32-utils.zip -o \ ! -f inputs/mingw-w64-$GCC_VER-win32-utils.zip -o \ ! -f inputs/zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \