From b6be81b841e34ca45b3549c4c79e886a8761e59a Mon Sep 17 00:00:00 2001 From: Thomas Miedema Date: Sat, 15 Aug 2015 11:36:44 +0200 Subject: Build system: delete half-baked Cygwin support We only support building GHC on mys2 nowadays, see https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation/Windows. This (partially) reverts various commits from a few years ago, among which: * 5775d5142da227d65fb86994d363eb16841ee642 "Add OSTYPE build-system variable, and use it" * 3fb8c431824aa2f3bd979e35d1a283546fcfbe74 "Fix building libgmp on cygwin" * cdbb4720c424500adb57cbbef69721d0b039fa46 "Fix cmd invocation by libffi cuild system on Windows 7 cygwin" * e8121501ee3549a35e954726ccfd871ac9d51f83 "Fix dblatex and xml* tool detection on Windows" Reviewed by: austin, Phyx Differential Revision: https://phabricator.haskell.org/D1155 --- aclocal.m4 | 48 ++++++++++-------------------------------------- 1 file changed, 10 insertions(+), 38 deletions(-) (limited to 'aclocal.m4') diff --git a/aclocal.m4 b/aclocal.m4 index 97731685a9..2f4d516945 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -274,7 +274,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], nto-qnx) test -z "[$]2" || eval "[$]2=OSQNXNTO" ;; - dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix) + dragonfly|osf1|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix) test -z "[$]2" || eval "[$]2=OSUnknown" ;; linux-android) @@ -591,21 +591,6 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], ]) -AC_DEFUN([FP_PATH_PROG],[ - AC_PATH_PROG($1,$2,$3,$4,$5,$6) - # If we have a cygwin path for something, and we try to run it - # from cabal or python, then it'll fail. So we convert to a - # native path. - if test "$HostOS" = "mingw32" && \ - test "${OSTYPE}" != "msys" && \ - test "${$1}" != "" - then - # Canonicalise to :/path/to/gcc - $1=`cygpath -m "${$1}"` - fi -]) - - # FP_VISIBILITY_HIDDEN # ---------------------------------- # Is the visibility hidden attribute supported? @@ -798,9 +783,6 @@ AC_DEFUN([FP_LEADING_UNDERSCORE], AC_CACHE_CHECK([leading underscore in symbol names], [fptools_cv_leading_underscore], [ # Hack!: nlist() under Digital UNIX insist on there being an _, # but symbol table listings shows none. What is going on here?!? -# -# Another hack: cygwin doesn't come with nlist.h , so we hardwire -# the underscoredness of that "platform" case $HostPlatform in *openbsd*) # x86 openbsd is ELF from 3.4 >, meaning no leading uscore case $build in @@ -808,7 +790,6 @@ case $HostPlatform in *) fptools_cv_leading_underscore=no ;; esac ;; alpha-dec-osf*) fptools_cv_leading_underscore=no;; -*cygwin32) fptools_cv_leading_underscore=yes;; i386-unknown-mingw32) fptools_cv_leading_underscore=yes;; x86_64-unknown-mingw32) fptools_cv_leading_underscore=no;; @@ -879,7 +860,7 @@ dnl If you increase the minimum version requirement, please also update: dnl https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation/Tools dnl AC_DEFUN([FPTOOLS_HAPPY], -[FP_PATH_PROG(HappyCmd,happy,) +[AC_PATH_PROG(HappyCmd,happy,) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, changequote(, )dnl @@ -907,7 +888,7 @@ dnl https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation/Tools dnl AC_DEFUN([FPTOOLS_ALEX], [ -FP_PATH_PROG(AlexCmd,alex,) +AC_PATH_PROG(AlexCmd,alex,) AC_CACHE_CHECK([for version of alex], fptools_cv_alex_version, changequote(, )dnl @@ -1051,9 +1032,9 @@ AC_SUBST([LdHasFilelist]) # FP_PROG_AR # ---------- -# Sets fp_prog_ar to a (non-Cygwin) path to ar. Exits if no ar can be found +# Sets fp_prog_ar to a path to ar. Exits if no ar can be found AC_DEFUN([FP_PROG_AR], -[FP_PATH_PROG([fp_prog_ar], [ar]) +[AC_PATH_PROG([fp_prog_ar], [ar]) if test -z "$fp_prog_ar"; then AC_MSG_ERROR([cannot find ar in your PATH, no idea how to make a library]) fi @@ -1105,7 +1086,7 @@ AC_SUBST([ArSupportsAtFile], [`echo $fp_prog_ar_supports_atfile | tr 'a-z' 'A-Z' # FP_PROG_AR_ARGS # --------------- # Sets fp_prog_ar_args to the arguments for ar and the output variable ArCmd -# to a non-Cygwin invocation of ar including these arguments. +# to an invocation of ar including these arguments. AC_DEFUN([FP_PROG_AR_ARGS], [AC_REQUIRE([FP_PROG_AR_IS_GNU]) AC_CACHE_CHECK([for ar arguments], [fp_cv_prog_ar_args], @@ -1281,15 +1262,6 @@ echo foo > conftest.txt $fp_prog_find conftest.txt -print > conftest.out 2>&1 if grep '^conftest.txt$' conftest.out > /dev/null 2>&1 ; then # OK, looks like a real "find". - case $HostPlatform in - *mingw32) - if test x${OSTYPE} != xmsys - then - fp_prog_find="`cygpath --mixed ${fp_prog_find}`" - AC_MSG_NOTICE([normalized find command to $fp_prog_find]) - fi ;; - *) ;; - esac FindCmd="$fp_prog_find" else # Found a poor WinDoze version of "find", ignore it. @@ -1445,7 +1417,7 @@ EOF # which we use for building PDF and PS docs. # DblatexCmd is empty if dblatex could not be found. AC_DEFUN([FP_PROG_DBLATEX], -[FP_PATH_PROG([DblatexCmd], [dblatex]) +[AC_PATH_PROG([DblatexCmd], [dblatex]) if test -z "$DblatexCmd"; then AC_MSG_WARN([cannot find dblatex in your PATH, you will not be able to build the PDF and PS documentation]) fi @@ -1457,7 +1429,7 @@ fi # Sets the output variable XsltprocCmd to the full path of the XSLT processor # xsltproc. XsltprocCmd is empty if xsltproc could not be found. AC_DEFUN([FP_PROG_XSLTPROC], -[FP_PATH_PROG([XsltprocCmd], [xsltproc]) +[AC_PATH_PROG([XsltprocCmd], [xsltproc]) if test -z "$XsltprocCmd"; then AC_MSG_WARN([cannot find xsltproc in your PATH, you will not be able to build the HTML documentation]) fi @@ -1493,7 +1465,7 @@ AC_SUBST([HAVE_DOCBOOK_XSL]) # Sets the output variable XmllintCmd to the full path of the XSLT processor # xmllint. XmllintCmd is empty if xmllint could not be found. AC_DEFUN([FP_PROG_XMLLINT], -[FP_PATH_PROG([XmllintCmd], [xmllint]) +[AC_PATH_PROG([XmllintCmd], [xmllint]) if test -z "$XmllintCmd"; then AC_MSG_WARN([cannot find xmllint in your PATH, you will not be able to validate your documentation]) fi @@ -1999,7 +1971,7 @@ case "$1-$2" in $3="linux" ;; # As far as I'm aware, none of these have relevant variants - freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) + freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) $3="$1" ;; freebsd*) # like i686-gentoo-freebsd7 -- cgit v1.2.1