diff options
| author | Josh Meredith <joshmeredith2008@gmail.com> | 2023-04-18 08:56:17 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-04-25 18:12:38 -0400 |
| commit | 8f656188e271fc55b31a50a1c2f3cf6ff9bbeeea (patch) | |
| tree | f1355837ab8525dcbf97c8e64a999c1ac345fff7 /hadrian | |
| parent | ebd5b0781c6e6f4642db91353fab0f0ec04af3bc (diff) | |
| download | haskell-8f656188e271fc55b31a50a1c2f3cf6ff9bbeeea.tar.gz | |
JS: Fix h$base_access implementation (issue 22576)
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 5e4a1ad17b..b3acadbcbd 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -105,7 +105,11 @@ inTreeCompilerArgs stg = do tables_next_to_code <- flag TablesNextToCode targetWithSMP <- targetSupportsSMP - let ghcStage = succStage stg + cross <- flag CrossCompiling + + let ghcStage + | cross, Stage1 <- stg = Stage1 + | otherwise = succStage stg debugAssertions <- ghcDebugAssertions <$> flavour <*> pure ghcStage debugged <- ghcDebugged <$> flavour <*> pure ghcStage profiled <- ghcProfiled <$> flavour <*> pure ghcStage |