summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2023-01-21 14:22:55 +0100
committerMatthew Pickering <matthewtpickering@gmail.com>2023-01-27 08:16:55 +0000
commit826a311221c271561459b62881b5d66e1c867825 (patch)
tree88aafabd610c12807399641d64237dcfc94fea42
parente0d9ef66737df07c599fce38ed7cff09ea297dc2 (diff)
downloadhaskell-826a311221c271561459b62881b5d66e1c867825.tar.gz
configure: support "windows" as an OS
(cherry picked from commit 2fdf22aebda2307d86872c792633d1856d666c9b)
-rw-r--r--m4/fptools_set_haskell_platform_vars.m42
-rw-r--r--m4/ghc_convert_os.m45
2 files changed, 5 insertions, 2 deletions
diff --git a/m4/fptools_set_haskell_platform_vars.m4 b/m4/fptools_set_haskell_platform_vars.m4
index 1a32b3046b..02b5b4e53c 100644
--- a/m4/fptools_set_haskell_platform_vars.m4
+++ b/m4/fptools_set_haskell_platform_vars.m4
@@ -82,7 +82,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS_SHELL_FUNCTIONS],
solaris2)
test -z "[$]2" || eval "[$]2=OSSolaris2"
;;
- mingw32)
+ mingw32|windows)
test -z "[$]2" || eval "[$]2=OSMinGW32"
;;
freebsd)
diff --git a/m4/ghc_convert_os.m4 b/m4/ghc_convert_os.m4
index 885ca24848..2f077910b3 100644
--- a/m4/ghc_convert_os.m4
+++ b/m4/ghc_convert_os.m4
@@ -22,8 +22,11 @@ AC_DEFUN([GHC_CONVERT_OS],[
openbsd*)
$3="openbsd"
;;
+ windows|mingw32)
+ $3="mingw32"
+ ;;
# As far as I'm aware, none of these have relevant variants
- freebsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
+ freebsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
$3="$1"
;;
msys)