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/bindist | |
| 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/bindist')
| -rw-r--r-- | hadrian/bindist/config.mk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/bindist/config.mk.in b/hadrian/bindist/config.mk.in index ee8366a26f..cad2ccc6e0 100644 --- a/hadrian/bindist/config.mk.in +++ b/hadrian/bindist/config.mk.in @@ -128,7 +128,7 @@ GhcUnregisterised = @Unregisterised@ ifeq "$(TargetArch_CPP)" "arm" # We don't support load/store barriers pre-ARMv7. See #10433. ArchSupportsSMP=$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES) -else ifeq "$(TargetArch_CPP)" "js" +else ifeq "$(TargetArch_CPP)" "javascript" ArchSupportsSMP=NO else ArchSupportsSMP=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 sparc powerpc powerpc64 powerpc64le s390x aarch64 riscv64))) |