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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/fptools_set_haskell_platform_vars.m4 | 2 | ||||
| -rw-r--r-- | m4/ghc_convert_cpu.m4 | 4 | ||||
| -rw-r--r-- | m4/ghc_unregisterised.m4 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/m4/fptools_set_haskell_platform_vars.m4 b/m4/fptools_set_haskell_platform_vars.m4 index 02b5b4e53c..2afb21e247 100644 --- a/m4/fptools_set_haskell_platform_vars.m4 +++ b/m4/fptools_set_haskell_platform_vars.m4 @@ -51,7 +51,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS_SHELL_FUNCTIONS], hppa|hppa1_1|ia64|m68k|nios2|riscv32|loongarch32|rs6000|s390|sh4|vax) test -z "[$]2" || eval "[$]2=ArchUnknown" ;; - js) + javascript) test -z "[$]2" || eval "[$]2=ArchJavaScript" ;; *) diff --git a/m4/ghc_convert_cpu.m4 b/m4/ghc_convert_cpu.m4 index b3f1789bbc..880daee61e 100644 --- a/m4/ghc_convert_cpu.m4 +++ b/m4/ghc_convert_cpu.m4 @@ -83,8 +83,8 @@ case "$1" in wasm32) $2="wasm32" ;; - js) - $2="js" + javascript) + $2="javascript" ;; *) echo "Unknown CPU $1" diff --git a/m4/ghc_unregisterised.m4 b/m4/ghc_unregisterised.m4 index 38b445067d..826714d8ad 100644 --- a/m4/ghc_unregisterised.m4 +++ b/m4/ghc_unregisterised.m4 @@ -5,7 +5,7 @@ AC_DEFUN([GHC_UNREGISTERISED], [ AC_MSG_CHECKING(whether target supports a registerised ABI) case "$TargetArch" in - i386|x86_64|powerpc|powerpc64|powerpc64le|s390x|arm|aarch64|riscv64|wasm32|js|loongarch64) + i386|x86_64|powerpc|powerpc64|powerpc64le|s390x|arm|aarch64|riscv64|wasm32|javascript|loongarch64) UnregisterisedDefault=NO AC_MSG_RESULT([yes]) ;; |