diff options
| author | sheaf <sam.derbyshire@gmail.com> | 2022-09-16 12:54:09 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-09-20 03:50:06 -0400 |
| commit | 545ff490144ed3ddd596d2a0c01b0a16b5528f63 (patch) | |
| tree | 4e6061e82dcadda09e8eb43914b4e32cb1ad400b /hadrian/cfg | |
| parent | 19f45a25f4b14fff081d75f506e7992c81371fc5 (diff) | |
| download | haskell-545ff490144ed3ddd596d2a0c01b0a16b5528f63.tar.gz | |
Hadrian: merge archives even in stage 0
We now always merge .a archives when ar supports -L.
This change is necessary in order to bootstrap GHC using GHC 9.4
on Windows, as nested archives aren't supported.
Not doing so triggered bug #21990 when trying to use the Win32
package, with errors such as:
Not a x86_64 PE+ file.
Unknown COFF 4 type in getHeaderInfo.
ld.lld: error: undefined symbol: Win32zm2zi12zi0zi0_SystemziWin32ziConsoleziCtrlHandler_withConsoleCtrlHandler1_info
We have to be careful about which ar is meant: in stage 0, the check
should be done on the system ar (system-ar in system.config).
Diffstat (limited to 'hadrian/cfg')
| -rw-r--r-- | hadrian/cfg/system.config.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index f3a4e3f438..0541d90138 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -39,10 +39,11 @@ python = @PythonCmd@ # Information about builders: #============================ -ar-supports-at-file = @ArSupportsAtFile@ -ar-supports-dash-l = @ArSupportsDashL@ -cc-llvm-backend = @CcLlvmBackend@ -hs-cpp-args = @HaskellCPPArgs@ +ar-supports-at-file = @ArSupportsAtFile@ +ar-supports-dash-l = @ArSupportsDashL@ +system-ar-supports-dash-l = @ArSupportsDashL_STAGE0@ +cc-llvm-backend = @CcLlvmBackend@ +hs-cpp-args = @HaskellCPPArgs@ # Build options: #=============== |