X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=201ca8878ea86b1a31faba2cda7680f785bc0e92;hb=e27a63d87e12d0ad1491ee372e025c65fcfd3d36;hp=50e1e48806264de5fbdd08aafc8afea8f93fb77b;hpb=5a6c2ce786ec8daf2e63f08513d17496414c18f2;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 50e1e48..201ca88 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -99,13 +99,11 @@ GhcStage3HcOpts=-O2
 
 GhcProfiled=NO
 GhcDebugged=NO
+GhcDynamic=NO
 GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
 
 # Do we support shared libs?
-PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32),YES,NO)
-
-# ToDo later:
-# BuildStaticLibs=@BuildStaticLibs@
+PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32 i386-apple-darwin powerpc-apple-darwin),YES,NO)
 
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
@@ -141,6 +139,9 @@ GhcWithNativeCodeGen=$(strip\
     $(if $(filter YESYESNO,\
 		  $(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO))
 
+# Build a compiler with the llvm code generator backend
+GhcWithLlvmCodeGen=NO
+
 HaveLibDL = @HaveLibDL@
 
 # ArchSupportsSMP should be set iff there is support for that arch in
@@ -591,11 +592,7 @@ INSTALL			:= $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
 LATEX			= latex
 PDFLATEX        = pdflatex
 BIBTEX          = bibtex
-HEVEA			= hevea
-HACHA			= hacha
 LN_S			= @LN_S@
-MANMACROS		= -man
-MSMACROS 		= -ms
 MV			= mv
 NROFF			= nroff
 PERL 			= @PerlCmd@
@@ -653,37 +650,24 @@ endif
 # with REAL_SHELL set to something else than /bin/sh, for instance, your favourite
 # command shell.
 #
-REAL_SHELL=$(SHELL)
-SIZE			= size
-STRIP			= strip
-PATCH			= @PatchCmd@
-TAR			= @TarCmd@
-BZIP2                   = bzip2
-GZIP                    = gzip
-ZIP			= zip
+REAL_SHELL     = $(SHELL)
 
-HSCOLOUR = @HSCOLOUR@
+STRIP_CMD      = strip
+PATCH_CMD      = @PatchCmd@
+TAR_CMD        = @TarCmd@
+BZIP2_CMD      = bzip2
+GZIP_CMD       = gzip
 
-#
-# This is special to literate/, ToDo: add literate-specific
-# configure setup to literate/.
-#
-TBL 			= tbl
-TEX			= tex
-TGRIND 			= tgrind
-TGRIND_HELPER 		= /usr/local/lib/tgrind/tfontedpr # XXX
-TIB			= tib
+HSCOLOUR_CMD   = @HSCOLOUR@
 
-TIME			= @TimeCmd@
-TROFF			= troff
-UNAME			= uname
+TIME_CMD       = @TimeCmd@
 
 # GTK+
-GTK_CONFIG = @GTK_CONFIG@
+GTK_CONFIG_CMD = @GTK_CONFIG@
 
 # Set this if you want to use Inno Setup to build a Windows installer
 # when you make a bindist
-ISCC                    =
+ISCC_CMD       =
 
 #-----------------------------------------------------------------------------
 # DocBook XML stuff
@@ -711,12 +695,6 @@ BLD_DLL			= dllwrap
 GHC_PKG		        = @GhcPkgCmd@
 
 #
-# GreenCard
-#
-GREENCARD	        = @GreenCardCmd@
-GREENCARD_VERSION	= @GreenCardVersion@		
-
-#
 # Happy
 #
 HAPPY			= @HappyCmd@
@@ -787,12 +765,5 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ICONV_INCLUDE_DIRS = @ICONV_INCLUDE_DIRS@
 ICONV_LIB_DIRS = @ICONV_LIB_DIRS@
 
-################################################################################
-#
-#    Bindist testing directory
-#
-################################################################################
-
-BIN_DIST_INST_SUBDIR = "install dir"
-BIN_DIST_INST_DIR = $(TOP)/bindisttest/$(BIN_DIST_INST_SUBDIR)
-
+GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@
+GMP_LIB_DIRS = @GMP_LIB_DIRS@