From f80d3afd7357edbeee0148faa9e8ca3e103a7174 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 24 May 2019 11:32:20 -0400
Subject: [PATCH] hadrian: Fix generation of settings
I jumbled some lines in e529c65eacf595006dd5358491d28c202d673732,
messing up the leading underscores and rts ways settings. This broke at
least stage1 linking on macOS, but probably loads of other things too.
Should fix #16685 and #16658.
---
hadrian/src/Rules/Generate.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs
index c8f8cf15ca..c755e389eb 100644
--- a/hadrian/src/Rules/Generate.hs
+++ b/hadrian/src/Rules/Generate.hs
@@ -314,9 +314,9 @@ generateSettings = do
, ("Use interpreter", expr $ yesNo <$> ghcWithInterpreter)
, ("Use native code generator", expr $ yesNo <$> ghcWithNativeCodeGen)
, ("Support SMP", expr $ yesNo <$> ghcWithSMP)
- , ("RTS ways", expr $ yesNo <$> flag LeadingUnderscore)
+ , ("RTS ways", unwords . map show <$> getRtsWays)
, ("Tables next to code", expr $ yesNo <$> ghcEnableTablesNextToCode)
- , ("Leading underscore", expr $ yesNo <$> useLibFFIForAdjustors)
+ , ("Leading underscore", expr $ yesNo <$> flag LeadingUnderscore)
, ("Use LibFFI", expr $ yesNo <$> useLibFFIForAdjustors)
, ("Use Threads", yesNo . any (wayUnit Threaded) <$> getRtsWays)
, ("Use Debugging", expr $ yesNo . ghcDebugged <$> flavour)
--
GitLab