X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=fd6ee477f0ec8871071025d89435fc3872cde080;hb=9142c238bd014c45e30fc79eee69fa6ab3f469d8;hp=cc4d767c8dcb3a21d9c1182c8672ad38bb7d549d;hpb=46809fa91667e952afe016e4cd704b21274241b4;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index cc4d767..fd6ee47 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -190,12 +190,6 @@ else UseLibFFIForAdjustors=YES endif -ifeq "$(findstring $(HostOS_CPP), darwin)" "" -UseArchivesForGhci = NO -else -UseArchivesForGhci = YES -endif - # On Windows we normally want to make a relocatable bindist, to we # ignore flags like libdir ifeq "$(Windows)" "YES" @@ -457,12 +451,9 @@ GENERATED_FILE = chmod a-w EXECUTABLE_FILE = chmod +x #----------------------------------------------------------------------------- -# Haskell compilers and mkdependHS +# Installed GHC -# $(GHC), $(HBC) and $(NHC) point to installed versions of the relevant -# compilers, if available. -# -# $(MKDEPENDHS) is the Haskell dependency generator (ghc -M). +# $(GHC) points to installed version of the compiler. # # NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead # (because the version numbers have to be calculated). @@ -475,14 +466,6 @@ ifneq "$(wildcard $(GHC).exe)" "" GHC := $(GHC).exe endif -GhcDir = $(dir $(GHC)) - -# Set to YES if $(GHC) has the editline package installed -GhcHasEditline = @GhcHasEditline@ - -HBC = @HBC@ -NHC = @NHC@ - # Sometimes we want to invoke ghc from the build tree in different # places (eg. it's handy to have a nofib & a ghc build in the same # tree). We can refer to "this ghc" as $(GHC_INPLACE):