X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=201ca8878ea86b1a31faba2cda7680f785bc0e92;hb=9e58a660bd80277669ef7a367ff6367fda51a8a4;hp=697bf51d9b51e835ed75e0f814c1c83a887aa5e1;hpb=88223168614ea60a5d76a264f6c11837b6c5a443;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 697bf51..201ca88 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -103,7 +103,7 @@ 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 i386-apple-darwin),YES,NO) +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 @@ -139,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 @@ -589,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@ @@ -651,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 @@ -709,12 +695,6 @@ BLD_DLL = dllwrap GHC_PKG = @GhcPkgCmd@ # -# GreenCard -# -GREENCARD = @GreenCardCmd@ -GREENCARD_VERSION = @GreenCardVersion@ - -# # Happy # HAPPY = @HappyCmd@