More build system changes; ghc-pkg is now built with Cabal

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 28b57a7..3391f17 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -277,9 +277,6 @@ GhcWithNativeCodeGen=$(strip\
     $(if $(filter YESYESNO,\
                  $(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO))
 
-# Include support for generating Java
-GhcWithJavaGen=NO
-
 HaveLibDL = @HaveLibDL@
 
 # ArchSupportsSMP should be set iff there is support for that arch in
@@ -349,8 +346,6 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 HscIfaceFileVersion=6
 
-MakefileDeps=YES
-
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -630,10 +625,7 @@ ifacedir           = $(libdir)
 #     (NOTE: configure script setting is ignored).
 libexecdir             = $(libdir)
 
-# This is a bit of a lie, as this is a wrapper rather than the program
-# itself. However, it means that we don't have to worry about Windows
-# and non-Windows having different extensions.
-GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace
+GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/install-inplace/bin/ghc-pkg
 
 #-----------------------------------------------------------------------------
 # install configuration
@@ -716,7 +708,7 @@ GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
 
 GHC_UTILS_DIR_REL      = utils
 GHC_INCLUDE_DIR_REL    = includes
-GHC_COMPILER_DIR_REL   = compiler
+GHC_COMPILER_DIR_REL = ghc
 GHC_RTS_DIR_REL                = rts
 GHC_UTILS_DIR_REL      = utils
 GHC_DRIVER_DIR_REL     = driver
@@ -793,6 +785,7 @@ GHC_TOUCHY_DIR_ABS  = $(FPTOOLS_TOP_ABS)/$(GHC_TOUCHY_DIR_REL)
 GHC_PKG_DIR_ABS                = $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)
 GHC_GENPRIMOP_DIR_ABS  = $(FPTOOLS_TOP_ABS)/$(GHC_GENPRIMOP_DIR_REL)
 GHC_GENAPPLY_DIR_ABS   = $(FPTOOLS_TOP_ABS)/$(GHC_GENAPPLY_DIR_REL)
+GHC_COMPILER_DIR_ABS   = $(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)
 
 GHC_MANGLER_DIR_ABS    = $(FPTOOLS_TOP_ABS)/$(GHC_MANGLER_DIR_REL)
 GHC_SYSMAN_DIR_ABS     = $(FPTOOLS_TOP_ABS)/$(GHC_SYSMAN_DIR_REL)
@@ -813,7 +806,6 @@ GHC_TOUCHY_PGM              = touchy$(exeext)
 GHC_MANGLER_PGM                = ghc-asm
 GHC_SPLIT_PGM          = ghc-split
 GHC_SYSMAN_PGM                 = SysMan
-GHC_PKG_INPLACE_PGM    = ghc-pkg-inplace
 GHC_GENPRIMOP_PGM      = genprimopcode
 GHC_GENAPPLY_PGM       = genapply
 GHC_MKDEPENDC_PGM      = mkdependC
@@ -838,7 +830,7 @@ HSC2HS_INPLACE              = $(GHC_HSC2HS_DIR)/install-inplace/bin/$(GHC_HSC2HS_INPLACE_PGM
 MANGLER                        = $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
 SPLIT                  = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)
 SYSMAN                         = $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
-GHC_PKG_INPLACE                = $(GHC_PKG_DIR)/$(GHC_PKG_INPLACE_PGM)
+GHC_PKG_INPLACE                = $(GHC_PKG_PROG)
 GENPRIMOP              = $(GHC_GENPRIMOP_DIR)/$(GHC_GENPRIMOP_PGM)
 GENAPPLY               = $(GHC_GENAPPLY_DIR)/$(GHC_GENAPPLY_PGM)
 MKDEPENDC              = $(GHC_MKDEPENDC_DIR)/$(GHC_MKDEPENDC_PGM)
@@ -875,10 +867,12 @@ NHC               = @NHC@
 # 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):
 
-GHC_INPLACE    = $(GHC_COMPILER_DIR)/ghc-inplace
-GHC_STAGE1     = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf
-GHC_STAGE2     = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf
-GHC_STAGE3     = $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf
+GHC_INPLACE = $(GHC_STAGE1)
+GHC_STAGE1  = $(GHC_COMPILER_DIR_ABS)/stage1-inplace/bin/ghc
+GHC_STAGE2  = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/bin/ghc
+GHC_STAGE3  = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/bin/ghc
+# XXX All those used to have -no-user-package-conf, but then we can't
+# pass them to Cabal
 
 BOOTSTRAPPING_CONF = $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
 
@@ -960,12 +954,6 @@ SRC_CC_OPTS += -G0
 endif
 
 SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
-SRC_HSC2HS_OPTS += --cc=$(CC)
-SRC_HSC2HS_OPTS += --ld=$(CC)
-SRC_HSC2HS_OPTS += --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)
-SRC_HSC2HS_OPTS += --lflag=-no-auto-link-packages
-SRC_HSC2HS_OPTS += -I$(GHC_INCLUDE_DIR_ABS)
-SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild
 
 # Given
 #   foo bar