[project @ 2000-11-03 17:09:00 by simonmar]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5d78e07..b83135e 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -141,22 +141,8 @@ IncludeTestDirsInBuild=NO
 #
 #---------------------------------------------------------------
 
-# Specify the Haskell compiler to be used to compile the compiler itself
-#
-#   WithGhcHc     Path name of the compiler to use
-#
-#   WithGhcHcType  What "type" of compiler is being used
-#                 Valid options:
-#                           HC_CHALMERS_HBC
-#                           HC_GLASGOW_GHC
-#                           HC_ROJEMO_NHC
-#                           HC_UNSPECIFIED
-
-WithGhcHc = @WithHc@
-
-# Variable which is set to the version number of the $(WithGhcHc) we're using.
-# Not currently used, but might come in handy sometime soon.
-#WithGhcHcVersion = $(shell echo `if ( $(WithGhcHc) --version 2>/dev/null >/dev/null ) then $(WithGhcHc) --version 2>&1 | @SedCmd@ -e 's/^.*version [^0-9]*\([.0-9]*\).*/\1/;s/\.//'; else echo unknown; fi; ` )
+# The compiler used to build GHC is $(GHC).  To change the actual compiler
+# used, re-configure with --with-ghc=<path-to-ghc>.
 
 # Extra ways in which to build the compiler (for example, you might want to
 # build a profiled compiler so you can see where it spends its time)
@@ -183,7 +169,18 @@ GhcWithHscBuiltViaC=@BootingFromHc@
 #
 # Target platforms supported:
 #   i386, alpha & sparc
-GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi)
+ifneq "$(findstring $(HostArch_CPP), i386 alpha sparc)" ""
+GhcWithNativeCodeGen=YES
+else
+GhcWithNativeCodeGen=NO
+endif
+
+# Include GHCi in the compiler
+ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
+GhcWithInterpreter=YES
+else 
+GhcWithInterpreter=NO
+endif
 
 #
 # Building various ways?
@@ -510,8 +507,11 @@ HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
 #
 # $(HC) is a generic Haskell 98 compiler, set to $(GHC) by default.
 # $(MKDEPENDHS) is the Haskell dependency generator (ghc -M).
+#
+# NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead
+# (because the version numbers have to be calculated).
 
-GHC            = @GHC@
+GHC            = @WithGhc@
 GhcVersion     = @GhcVersion@
 GhcMajVersion  = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@