From fd763f4a43cffb8d39639506e24a9658285598d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 15 Sep 2020 17:05:44 +0300 Subject: [PATCH] build-mingw-w64-tools: Add widl symlinks with the mingw32uwp name --- build-mingw-w64-tools.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-mingw-w64-tools.sh b/build-mingw-w64-tools.sh index d7bb1fe..275126c 100755 --- a/build-mingw-w64-tools.sh +++ b/build-mingw-w64-tools.sh @@ -57,6 +57,7 @@ fi : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} : ${CORES:=4} : ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}} +: ${TARGET_OSES:=${TOOLCHAIN_TARGET_OSES-mingw32 mingw32uwp}} if [ -n "$HOST" ]; then CONFIGFLAGS="$CONFIGFLAGS --host=$HOST" @@ -90,9 +91,11 @@ cd "$PREFIX/bin" # The build above produced $ANY_ARCH-w64-mingw32-widl, add symlinks to it # with other prefixes. for arch in $ARCHS; do - if [ "$arch" != "$ANY_ARCH" ]; then - ln -sf $ANY_ARCH-w64-mingw32-widl$EXEEXT $arch-w64-mingw32-widl$EXEEXT - fi + for target_os in $TARGET_OSES; do + if [ "$arch" != "$ANY_ARCH" ] || [ "$target_os" != "mingw32" ]; then + ln -sf $ANY_ARCH-w64-mingw32-widl$EXEEXT $arch-w64-$target_os-widl$EXEEXT + fi + done done if [ -n "$EXEEXT" ]; then # In a build of the tools for windows, we also want to provide an