Hannes Siebenhandl pushed to branch wip/fendor/mingw-bindist at Glasgow Haskell Compiler / GHC Commits: 720d5c52 by Hannes Siebenhandl at 2026-09-29T14:14:11+02:00 Fix path references in mingw default.target file The escaping `$` is no longer necessary since 7d378476c33 copies the `default.target` instead of generating it via config.mk. - - - - - 5416da68 by Hannes Siebenhandl at 2026-09-29T14:17:52+02:00 Add sanity checking for SUBST_TOOLDIR - - - - - 2 changed files: - distrib/configure.ac.in - m4/subst_tooldir.m4 Changes: ===================================== distrib/configure.ac.in ===================================== @@ -103,7 +103,7 @@ AC_ARG_ENABLE(distro-toolchain, AC_SUBST([EnableDistroToolchain]) if test "$HostOS" = "mingw32" -a "$EnableDistroToolchain" = "NO"; then - FP_SETUP_WINDOWS_TOOLCHAIN([$hardtop/mingw/], [\$\$topdir/../mingw/]) + FP_SETUP_WINDOWS_TOOLCHAIN([$hardtop/mingw/], [\$topdir/../mingw/]) fi ===================================== m4/subst_tooldir.m4 ===================================== @@ -41,5 +41,13 @@ dnl ghc-toolchain. # See Note [How we configure the bundled windows toolchain] AC_DEFUN([SUBST_TOOLDIR], [ - sed -i.bkp $1 's%'"$mingw_prefix"'%'"$mingw_install_prefix"'%g' + if ! grep -qF "$mingw_prefix" $1; then + AC_MSG_ERROR([SUBST_TOOLDIR: $1 does not refer to the bundled mingw toolchain at $mingw_prefix]) + fi + if ! sed -i.bkp 's%'"$mingw_prefix"'%'"$mingw_install_prefix"'%g' $1; then + AC_MSG_ERROR([SUBST_TOOLDIR: failed to substitute $mingw_prefix in $1]) + fi + if grep -qF "$mingw_prefix" $1; then + AC_MSG_ERROR([SUBST_TOOLDIR: $1 still refers to $mingw_prefix after substitution]) + fi ]) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/06c6464956df5306648b95b62c3ca74... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/06c6464956df5306648b95b62c3ca74... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help