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 /rts | |
| 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 'rts')
| -rw-r--r-- | rts/include/stg/MachRegsForHost.h | 2 | ||||
| -rw-r--r-- | rts/rts.cabal.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/rts/include/stg/MachRegsForHost.h b/rts/include/stg/MachRegsForHost.h index 6452df4158..f401122e5f 100644 --- a/rts/include/stg/MachRegsForHost.h +++ b/rts/include/stg/MachRegsForHost.h @@ -14,7 +14,7 @@ #pragma once -#if defined(UnregisterisedCompiler) || defined(js_HOST_ARCH) +#if defined(UnregisterisedCompiler) || defined(javascript_HOST_ARCH) #if !defined(NO_REGS) #define NO_REGS #endif diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index 00d720d4ff..276f7e1b00 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -81,7 +81,8 @@ library exposed: True exposed-modules: - if os(ghcjs) + + if arch(javascript) include-dirs: include -- dummy file to force the build of a .a lib |