diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2023-02-02 16:01:56 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-02-06 09:43:21 -0500 |
| commit | 6636b670233522f01d002c9b97827d00289dbf5c (patch) | |
| tree | ccfd2ae729261fdb52e97dec8629a875b58e4512 /hadrian/src/Oracles/Flag.hs | |
| parent | b18fbf52f98d0128c52b3a90ddca727a6d5d4d45 (diff) | |
| download | haskell-6636b670233522f01d002c9b97827d00289dbf5c.tar.gz | |
JS: replace "js" architecture with "javascript"
Despite Cabal supporting any architecture name, `cabal --check` only
supports a few built-in ones. Sadly `cabal --check` is used by Hackage
hence using any non built-in name in a package (e.g. `arch(js)`) is
rejected and the package is prevented from being uploaded on Hackage.
Luckily built-in support for the `javascript` architecture was added for
GHCJS a while ago. In order to allow newer `base` to be uploaded on
Hackage we make the switch from `js` to `javascript` architecture.
Fixes #22740.
Co-authored-by: Ben Gamari <ben@smart-cactus.org>
Diffstat (limited to 'hadrian/src/Oracles/Flag.hs')
| -rw-r--r-- | hadrian/src/Oracles/Flag.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/src/Oracles/Flag.hs b/hadrian/src/Oracles/Flag.hs index d3baec4932..3f7a2c4551 100644 --- a/hadrian/src/Oracles/Flag.hs +++ b/hadrian/src/Oracles/Flag.hs @@ -100,14 +100,14 @@ platformSupportsSharedLibs = do wasm <- anyTargetArch [ "wasm32" ] ppc_linux <- anyTargetPlatform [ "powerpc-unknown-linux" ] solaris <- anyTargetPlatform [ "i386-unknown-solaris2" ] - javascript <- anyTargetArch [ "js" ] + javascript <- anyTargetArch [ "javascript" ] solarisBroken <- flag SolarisBrokenShld return $ not (windows || wasm || javascript || ppc_linux || solaris && solarisBroken) -- | Does the target support threaded RTS? targetSupportsThreadedRts :: Action Bool targetSupportsThreadedRts = do - bad_arch <- anyTargetArch [ "wasm32", "js" ] + bad_arch <- anyTargetArch [ "wasm32", "javascript" ] return $ not bad_arch -- | Does the target support the -N RTS flag? |