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
3 changed files:
Changes:
| ... | ... | @@ -1338,7 +1338,7 @@ cross_jobs = [ |
| 1338 | 1338 | . setVariable "SIZE" (llvm_prefix ++ "size")
|
| 1339 | 1339 | . setVariable "STRINGS" (llvm_prefix ++ "strings")
|
| 1340 | 1340 | . setVariable "STRIP" (llvm_prefix ++ "strip")
|
| 1341 | - . setVariable "WindresCmd" (llvm_prefix ++ "windres")
|
|
| 1341 | + . setVariable "WindresCmd" (llvm_prefix ++ "windres" ++ exe_suffix)
|
|
| 1342 | 1342 | . setVariable "LLVMAS" (llvm_prefix ++ "clang")
|
| 1343 | 1343 | . setVariable "LD" (llvm_prefix ++ "ld")
|
| 1344 | 1344 | -- See Note [Empty MergeObjsCmd]
|
| ... | ... | @@ -560,7 +560,7 @@ |
| 560 | 560 | "STRIP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strip",
|
| 561 | 561 | "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build",
|
| 562 | 562 | "TOOLCHAIN_SOURCE": "env",
|
| 563 | - "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres"
|
|
| 563 | + "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres.exe"
|
|
| 564 | 564 | }
|
| 565 | 565 | },
|
| 566 | 566 | "i386-linux-alpine3_20-validate": {
|
| ... | ... | @@ -1317,7 +1317,7 @@ |
| 1317 | 1317 | "STRIP": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-strip",
|
| 1318 | 1318 | "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate-_wine_full_build",
|
| 1319 | 1319 | "TOOLCHAIN_SOURCE": "env",
|
| 1320 | - "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres",
|
|
| 1320 | + "WindresCmd": "C:/msys64/opt/ghc-bootstrap/mingw/bin/aarch64-w64-mingw32-windres.exe",
|
|
| 1321 | 1321 | "XZ_OPT": "-9"
|
| 1322 | 1322 | }
|
| 1323 | 1323 | },
|
| ... | ... | @@ -79,10 +79,13 @@ AC_DEFUN([FP_SETTINGS], |
| 79 | 79 | [AC_MSG_ERROR(Unknown CPPSupportsG0 value $CmmCPPSupportsG0)]
|
| 80 | 80 | )
|
| 81 | 81 | |
| 82 | + AC_MSG_CHECKING([whether $WindresCmd exists])
|
|
| 82 | 83 | if test -z "$WindresCmd"; then
|
| 83 | 84 | SettingsWindresCommand="/bin/false"
|
| 85 | + AC_MSG_RESULT([no, use $SettingsWindresCommand])
|
|
| 84 | 86 | else
|
| 85 | 87 | SettingsWindresCommand="$WindresCmd"
|
| 88 | + AC_MSG_RESULT([yes])
|
|
| 86 | 89 | fi
|
| 87 | 90 | |
| 88 | 91 | # LLVM backend tools
|
| ... | ... | @@ -92,6 +95,7 @@ AC_DEFUN([FP_SETTINGS], |
| 92 | 95 | SettingsLlvmAsFlags="$LlvmAsFlags"
|
| 93 | 96 | |
| 94 | 97 | if test "$EnableDistroToolchain" = "YES"; then
|
| 98 | + AC_MSG_NOTICE([--enable-distro-toolchain is specified, applying basename])
|
|
| 95 | 99 | # If the user specified --enable-distro-toolchain then we just use the
|
| 96 | 100 | # executable names, not paths.
|
| 97 | 101 | SettingsCCompilerCommand="$(basename $SettingsCCompilerCommand)"
|
| ... | ... | @@ -108,6 +112,7 @@ AC_DEFUN([FP_SETTINGS], |
| 108 | 112 | fi
|
| 109 | 113 | |
| 110 | 114 | if test "$windows" = YES -a "$EnableDistroToolchain" = "NO"; then
|
| 115 | + AC_MSG_NOTICE([--enable-distro-toolchain is not specified at Windows])
|
|
| 111 | 116 | # Handle the Windows toolchain installed in FP_SETUP_WINDOWS_TOOLCHAIN.
|
| 112 | 117 | # We need to issue a substitution to use $tooldir,
|
| 113 | 118 | # See Note [tooldir: How GHC finds mingw on Windows]
|