Commit 8e9626ce authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Remove more GMP bits

parent e543f10a
...@@ -58,25 +58,6 @@ if test x"$srcdir" != 'x.' ; then ...@@ -58,25 +58,6 @@ if test x"$srcdir" != 'x.' ; then
exit 1 exit 1
fi fi
dnl--------------------------------------------------------------------
dnl * Deal with arguments telling us gmp is somewhere odd
dnl--------------------------------------------------------------------
FP_ARG_GMP
GMP_INCLUDE_DIRS=
GMP_LIB_DIRS=
if test "x$gmp_libraries" != "xNONE"; then
LDFLAGS="-L$gmp_libraries $LDFLAGS"
GMP_LIB_DIRS=$gmp_libraries
fi
if test "x$gmp_includes" != "xNONE"; then
CPPFLAGS="-I$gmp_includes $CPPFLAGS"
GMP_INCLUDE_DIRS=$gmp_includes
fi
AC_SUBST(GMP_INCLUDE_DIRS)
AC_SUBST(GMP_LIB_DIRS)
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
dnl * Project specific configuration options dnl * Project specific configuration options
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
...@@ -759,36 +740,6 @@ AC_CHECK_DECLS([ctime_r], , , ...@@ -759,36 +740,6 @@ AC_CHECK_DECLS([ctime_r], , ,
#define _POSIX_C_SOURCE 199506L #define _POSIX_C_SOURCE 199506L
#include <time.h>]) #include <time.h>])
dnl ** For ghc/rts/gmp:
AC_CHECK_FUNCS([getpagesize])
dnl ** check whether this machine has gmp3 installed
AC_CHECK_LIB(gmp, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
AC_CHECK_LIB(gmp3, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp3,
HaveLibGmp=NO; LibGmp=not-installed))
if test $HaveLibGmp = YES; then
AC_DEFINE([HAVE_LIB_GMP], [1], [Define to 1 if GMP library is installed.])
fi;
AC_SUBST(HaveLibGmp)
AC_SUBST(LibGmp)
dnl ** (Mac OS X only: check for GMP.framework)
HaveFrameworkGMP=NO
case $HostPlatform in
*-apple-darwin)
AC_MSG_CHECKING([for GMP.framework])
save_libs="$LIBS"
LIBS="-framework GMP"
AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
if test $HaveFrameworkGMP = YES; then
AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
fi;
LIBS="$save_libs"
AC_MSG_RESULT([$HaveFrameworkGMP])
;;
esac
AC_SUBST(HaveFrameworkGMP)
dnl ** check for mingwex library dnl ** check for mingwex library
AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO) AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO)
AC_SUBST(HaveLibMingwEx) AC_SUBST(HaveLibMingwEx)
...@@ -797,12 +748,6 @@ if test $HaveLibMingwEx = YES ; then ...@@ -797,12 +748,6 @@ if test $HaveLibMingwEx = YES ; then
AC_DEFINE([HAVE_MINGWEX], [1], [Define to 1 if you have the mingwex library.]) AC_DEFINE([HAVE_MINGWEX], [1], [Define to 1 if you have the mingwex library.])
fi fi
if test "$HaveLibGmp" = "NO"; then
if test "$HostArch_CPP" = "ia64" -o "$HostArch_CPP" = "mipseb" ; then
AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64 or mips64).])
fi;
fi;
dnl ** check whether this machine has BFD and liberty installed (used for debugging) dnl ** check whether this machine has BFD and liberty installed (used for debugging)
dnl the order of these tests matters: bfd needs liberty dnl the order of these tests matters: bfd needs liberty
AC_CHECK_LIB(iberty, xmalloc) AC_CHECK_LIB(iberty, xmalloc)
......
...@@ -77,13 +77,8 @@ else ...@@ -77,13 +77,8 @@ else
UNDERSCORE= UNDERSCORE=
endif endif
ifeq "$(HaveLibGmp)" "NO"
DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)/gmp
endif
HC_BOOT_LD_OPTS = \ HC_BOOT_LD_OPTS = \
-L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL) \ -L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL) \
$(DASH_L_GHC_RTS_GMP_DIR) \
-L$(FPTOOLS_TOP_ABS)/libraries/base \ -L$(FPTOOLS_TOP_ABS)/libraries/base \
-L$(FPTOOLS_TOP_ABS)/libraries/base/cbits \ -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits \
-L$(FPTOOLS_TOP_ABS)/libraries/haskell98 \ -L$(FPTOOLS_TOP_ABS)/libraries/haskell98 \
......
...@@ -700,20 +700,6 @@ endif ...@@ -700,20 +700,6 @@ endif
SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS))) SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d)) SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d))
#-----------------------------------------------------------------------------
# GMP Library (version 2.0.x or above)
#
HaveLibGmp = @HaveLibGmp@
LibGmp = @LibGmp@
GMP_INCLUDE_DIRS=@GMP_INCLUDE_DIRS@
GMP_LIB_DIRS=@GMP_LIB_DIRS@
#-----------------------------------------------------------------------------
# GMP framework (Mac OS X)
#
HaveFrameworkGMP = @HaveFrameworkGMP@
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Mingwex Library # Mingwex Library
# #
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment