Skip to content

Commit 4cecf4c

Browse files
committed
Fix regression with missing MinGW header when building mingw-w64-cross-mingwarm64-crt
1 parent 8140058 commit 4cecf4c

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/scripts/enable-ccache.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
source `dirname ${BASH_SOURCE[0]}`/../../config.sh
44

5+
PACKAGE_REPOSITORY=$1
6+
57
DIR="`dirname ${BASH_SOURCE[0]}`/../.."
68
DIR=`realpath $DIR`
79
CCACHE_DIR=$DIR/ccache
@@ -32,16 +34,17 @@ pushd /
3234
echo "::endgroup::"
3335
popd
3436

35-
pacman -S --noconfirm ccache
37+
if [[ "$PACKAGE_REPOSITORY" == *MINGW* ]]; then
38+
pacman -S --noconfirm mingw-w64-clang-aarch64-ccache
39+
else
40+
pacman -S --noconfirm ccache
41+
fi
3642

3743
pushd /usr/lib/ccache/bin
3844
echo "::group::Add aarch64 toolchain to ccache"
3945
export MSYS=winsymlinks
4046
ln -sf /usr/bin/ccache aarch64-w64-mingw32-c++
4147
ln -sf /usr/bin/ccache aarch64-w64-mingw32-g++
4248
ln -sf /usr/bin/ccache aarch64-w64-mingw32-gcc
43-
if [[ "$FLAVOR" = "CROSS" ]]; then
44-
ln -sf /usr/bin/true makeinfo
45-
fi
4649
echo "::endgroup::"
4750
popd

.github/scripts/pthread-headers-hack-after.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ pacman -R --noconfirm mingw-w64-cross-mingw64-winpthreads || true
66
rm -rf /opt/aarch64-w64-mingw32/include/pthread_signal.h
77
rm -rf /opt/aarch64-w64-mingw32/include/pthread_unistd.h
88
rm -rf /opt/aarch64-w64-mingw32/include/pthread_time.h
9+
rm -rf /opt/aarch64-w64-mingw32/include/pthread_compat.h

.github/scripts/pthread-headers-hack-before.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ pacman -S --noconfirm mingw-w64-cross-mingw64-winpthreads
66
cp /opt/x86_64-w64-mingw32/include/pthread_signal.h /opt/aarch64-w64-mingw32/include/
77
cp /opt/x86_64-w64-mingw32/include/pthread_unistd.h /opt/aarch64-w64-mingw32/include/
88
cp /opt/x86_64-w64-mingw32/include/pthread_time.h /opt/aarch64-w64-mingw32/include/
9+
cp /opt/x86_64-w64-mingw32/include/pthread_compat.h /opt/aarch64-w64-mingw32/include/

0 commit comments

Comments
 (0)