Serge S. Gulin pushed to branch wip/T25974 at Glasgow Haskell Compiler / GHC Commits: caa9b692 by Serge S. Gulin at 2025-05-15T18:58:16+04:00 Add `.exe` to `WindresCmd` environment var and more debugging info around it - - - - - 3 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - m4/fp_settings.m4 Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -1338,7 +1338,7 @@ cross_jobs = [ . setVariable "SIZE" (llvm_prefix ++ "size") . setVariable "STRINGS" (llvm_prefix ++ "strings") . setVariable "STRIP" (llvm_prefix ++ "strip") - . setVariable "WindresCmd" (llvm_prefix ++ "windres") + . setVariable "WindresCmd" (llvm_prefix ++ "windres" ++ exe_suffix) . setVariable "LLVMAS" (llvm_prefix ++ "clang") . setVariable "LD" (llvm_prefix ++ "ld") -- See Note [Empty MergeObjsCmd] ===================================== .gitlab/jobs.yaml ===================================== @@ -560,7 +560,7 @@ "STRIP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strip", "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build", "TOOLCHAIN_SOURCE": "env", - "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres" + "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres.exe" } }, "i386-linux-alpine3_20-validate": { @@ -1317,7 +1317,7 @@ "STRIP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strip", "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build", "TOOLCHAIN_SOURCE": "env", - "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres", + "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres.exe", "XZ_OPT": "-9" } }, ===================================== m4/fp_settings.m4 ===================================== @@ -79,10 +79,13 @@ AC_DEFUN([FP_SETTINGS], [AC_MSG_ERROR(Unknown CPPSupportsG0 value $CmmCPPSupportsG0)] ) + AC_MSG_CHECKING([whether $WindresCmd exists]) if test -z "$WindresCmd"; then SettingsWindresCommand="/bin/false" + AC_MSG_RESULT([no, use $SettingsWindresCommand]) else SettingsWindresCommand="$WindresCmd" + AC_MSG_RESULT([yes]) fi # LLVM backend tools @@ -92,6 +95,7 @@ AC_DEFUN([FP_SETTINGS], SettingsLlvmAsFlags="$LlvmAsFlags" if test "$EnableDistroToolchain" = "YES"; then + AC_MSG_NOTICE([--enable-distro-toolchain is specified, applying basename]) # If the user specified --enable-distro-toolchain then we just use the # executable names, not paths. SettingsCCompilerCommand="$(basename $SettingsCCompilerCommand)" @@ -108,6 +112,7 @@ AC_DEFUN([FP_SETTINGS], fi if test "$windows" = YES -a "$EnableDistroToolchain" = "NO"; then + AC_MSG_NOTICE([--enable-distro-toolchain is not specified at Windows]) # Handle the Windows toolchain installed in FP_SETUP_WINDOWS_TOOLCHAIN. # We need to issue a substitution to use $tooldir, # See Note [tooldir: How GHC finds mingw on Windows] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/caa9b692569eb03a2a4d1e4ae990cbc7... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/caa9b692569eb03a2a4d1e4ae990cbc7... You're receiving this email because of your account on gitlab.haskell.org.