[project @ 2005-01-27 12:47:05 by simonpj]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a3eb22c..2ddfe82 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -296,6 +296,7 @@ endif
 #   thr_p       : threaded profiled
 #   debug       : debugging (compile with -g for the C compiler, and -DDEBUG)
 #   debug_p     : debugging profiled
+#   debug_u     : debugging unregisterised
 #   thr_debug   : debugging threaded
 #   thr_debug_p : debugging threaded profiled
 #
@@ -318,17 +319,6 @@ GhcLibHcOpts=-O -Rghc-timing
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 DLLized=@EnableWin32DLLs@
 
-# Win32 only: are we building a compiler that tries to reduce external
-# dependencies? i.e., one that doesn't assume that the user has got
-# the cygwin toolchain installed on his/her Win32 box.
-#
-# GHC is still dependent on GNU tools in the backend (gcc to further process
-# .c/.hc/.s/.o files + 'perl' to mangle and split), but using this
-# option a GHC distribution can be put together which includes a minimal
-# set of these open source tools. 
-#
-MinimalUnixDeps=@MinimalUnixDeps@
-
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
 #
@@ -709,9 +699,6 @@ else
 GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
 endif
 
-# Set to YES if $(GHC) has the readline package installed
-GhcHasReadline = @GhcHasReadline@
-
 HBC            = @HBC@
 NHC            = @NHC@
 
@@ -777,11 +764,6 @@ HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
 HavePosixRegex  = @HavePosixRegex@
 
 #-----------------------------------------------------------------------------
-# GTK+
-
-GTK_CONFIG             = @GTK_CONFIG@
-
-#-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
 
 # FLEX                 = @LEX@
@@ -831,12 +813,17 @@ RM                        = rm -f
 SED                    = @SedCmd@
 SHELL                  = /bin/sh
 
+LD                     = @LdCmd@
+
 # Some ld's support the -x flag and some don't, so the configure
 # script detects which we have and sets LdXFlag to "-x" or ""
 # respectively.
-LD                     = @LdCmd@
 LD_X                   = @LdXFlag@
 
+# GNU ld supports input via a linker script, which is useful to avoid
+# overflowing command-line length limits.
+LdIsGNULd              = @LdIsGNULd@
+
 #
 # In emergency situations, REAL_SHELL is used to perform shell commands
 # from within the ghc driver script, by scribbling the command line to
@@ -907,7 +894,6 @@ ETAGS                       = $(ETAGS_PREFIX)etags
 VERBATIM               = $(VERBATIM_PREFIX)verbatim
 SGMLVERB               = $(SGMLVERB_PREFIX)sgmlverb
 RUNTEST                        = $(RUNTEST_PREFIX)runstdtest
-LX                     = @LxCmd@
 
 BLD_DLL                        = dllwrap
 
@@ -1071,6 +1057,10 @@ WAY_debug_HC_OPTS=-optc-DDEBUG
 WAY_debug_p_NAME=debug profiled
 WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
 
+# Way 'debug_u':
+WAY_debug_u_NAME=debug unregisterised
+WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg
+
 # Way 'thr_debug':
 WAY_thr_debug_NAME=threaded
 WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG