Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
-
88c93796
by Zubin Duggal at 2026-01-21T16:09:42-05:00
1 changed file:
Changes:
| ... | ... | @@ -480,13 +480,8 @@ mkTarget opts = do |
| 480 | 480 | opt <- optional $ findProgram "opt" (optOpt opts) ["opt"]
|
| 481 | 481 | llvmAs <- optional $ findProgram "llvm assembler" (optLlvmAs opts) ["clang"]
|
| 482 | 482 | |
| 483 | - -- Windows-specific utilities
|
|
| 484 | - windres <-
|
|
| 485 | - case archOS_OS archOs of
|
|
| 486 | - OSMinGW32 -> do
|
|
| 487 | - windres <- findProgram "windres" (optWindres opts) ["windres"]
|
|
| 488 | - return (Just windres)
|
|
| 489 | - _ -> return Nothing
|
|
| 483 | + -- for windows, also used for cross compiling
|
|
| 484 | + windres <- optional $ findProgram "windres" (optWindres opts) ["windres"]
|
|
| 490 | 485 | |
| 491 | 486 | -- Darwin-specific utilities
|
| 492 | 487 | (otool, installNameTool) <-
|