diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 87 |
1 files changed, 20 insertions, 67 deletions
diff --git a/configure.ac b/configure.ac index 199ce5139b..78a157b536 100644 --- a/configure.ac +++ b/configure.ac @@ -94,22 +94,6 @@ dnl ** Tell the make system which OS we are using dnl $OSTYPE is set by the operating system to "msys" or "cygwin" or something AC_SUBST(OSTYPE) -dnl ** Booting from .hc files? -dnl -------------------------------------------------------------- -AC_ARG_ENABLE(hc-boot, -[AC_HELP_STRING([--enable-hc-boot], -[Boot the Glasgow Haskell Compiler from intermediate .hc files. - (This option is mostly of interest to porters.) [default=no]])], -[ if test x"$enableval" = x"yes"; then - BootingFromHc=YES - else - BootingFromHc=NO - fi -], -[BootingFromHc=NO] -) -AC_SUBST(BootingFromHc) - AC_ARG_ENABLE(bootstrap-with-devel-snapshot, [AC_HELP_STRING([--enable-bootstrap-with-devel-snapshot], [Allow bootstrapping using a development snapshot of GHC. This is not guaranteed to work.])], @@ -144,28 +128,29 @@ if test "$WithGhc" != ""; then fi fi -dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on -if test "$BootingFromHc" = "NO"; then - if test "$WithGhc" = ""; then - AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.]) - fi - FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.4], +dnl ** Must have GHC to build GHC +if test "$WithGhc" = "" +then + AC_MSG_ERROR([GHC is required.]) +fi +FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.4], [AC_MSG_ERROR([GHC version 7.4 or later is required to compile GHC.])])dnl - if test `expr $GhcMinVersion % 2` = "1"; then - if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then +if test `expr $GhcMinVersion % 2` = "1" +then + if test "$EnableBootstrapWithDevelSnaphost" = "NO" + then AC_MSG_ERROR([ $WithGhc is a development snapshot of GHC, version $GhcVersion. Bootstrapping using this version of GHC is not supported, and may not work. Use --enable-bootstrap-with-devel-snapshot to try it anyway, or --with-ghc to specify a different GHC to use.]) - fi - fi + fi +fi - GHC_PACKAGE_DB_FLAG=package-db - FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.5],GHC_PACKAGE_DB_FLAG=package-conf) - AC_SUBST(GHC_PACKAGE_DB_FLAG) -fi; +GHC_PACKAGE_DB_FLAG=package-db +FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.5],GHC_PACKAGE_DB_FLAG=package-conf) +AC_SUBST(GHC_PACKAGE_DB_FLAG) # GHC is passed to Cabal, so we need a native path if test "${WithGhc}" != "" @@ -215,15 +200,12 @@ FPTOOLS_SET_PLATFORM_VARS # Verify that the installed (bootstrap) GHC is capable of generating # code for the requested build platform. -if test "$BootingFromHc" = "NO" +if test "$BuildPlatform" != "$bootstrap_target" then - if test "$BuildPlatform" != "$bootstrap_target" - then - echo "This GHC (${WithGhc}) does not generate code for the build platform" - echo " GHC target platform : $bootstrap_target" - echo " Desired build platform : $BuildPlatform" - exit 1 - fi + echo "This GHC (${WithGhc}) does not generate code for the build platform" + echo " GHC target platform : $bootstrap_target" + echo " Desired build platform : $BuildPlatform" + exit 1 fi # Testing if we shall enable shared libs support on Solaris. @@ -516,23 +498,6 @@ FIND_LLVM_PROG([OPT], [opt], [opt]) OptCmd="$OPT" AC_SUBST([OptCmd]) -dnl ** Mac OS X: explicit deployment target -dnl -------------------------------------------------------------- -AC_ARG_WITH([macosx-deployment-target], -[AC_HELP_STRING([--with-macosx-deployment-target=VERSION], - [Build for Mac OS VERSION and higher (default= version of build host)])], -[FP_MACOSX_DEPLOYMENT_TARGET="$withval" - if test "x$TargetOS_CPP-$TargetVendor_CPP" != "xdarwin-apple"; then - # ignore everywhere, but on Mac OS - AC_MSG_WARN([--macosx-deployment-target is only available on Mac OS X]) - FP_MACOSX_DEPLOYMENT_TARGET=none - fi], -[FP_MACOSX_DEPLOYMENT_TARGET=none] -) -FP_CHECK_MACOSX_DEPLOYMENT_TARGET -AC_SUBST(MACOSX_DEPLOYMENT_VERSION) -AC_SUBST(MACOSX_DEPLOYMENT_SDK) - dnl -------------------------------------------------------------- dnl End of configure script option section dnl -------------------------------------------------------------- @@ -685,16 +650,10 @@ dnl ** check for ghc-pkg command FP_PROG_GHC_PKG dnl ** check for installed happy binary + version -dnl (don't do it if we're booting from .hc files though.) -if test "$BootingFromHc" = "NO"; then FPTOOLS_HAPPY -fi; dnl ** check for installed alex binary + version -dnl (don't do it if we're booting from .hc files though.) -if test "$BootingFromHc" = "NO"; then FPTOOLS_ALEX -fi; dnl -------------------------------------------------- dnl ### program checking section ends here ### @@ -976,16 +935,10 @@ Configure completed successfully. Target platform : $TargetPlatform "] -if test "$BootingFromHc" = "YES"; then -echo ["\ - Bootstrapping from HC files. -"] -else echo ["\ Bootstrapping using : $WithGhc which is version : $GhcVersion "] -fi if test "x$CC_LLVM_BACKEND" = "x1"; then if test "x$CC_CLANG_BACKEND" = "x1"; then |