X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=3391f1788c157b84379d048dc7c75eb284a4c973;hp=12795234b8d54ab15ea9daa1fc4195bf5af68337;hb=eed437cdefb952e6c70e58012b23d436e74710af;hpb=9f592bb0ae0dc76bd3ec7729474057d2069bb4db diff --git a/mk/config.mk.in b/mk/config.mk.in index 1279523..3391f17 100644 --- 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 @@ -402,12 +397,12 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO) # -O(2) is pretty desirable, otherwise no inlining of prelude # things (incl "+") happens when compiling with this compiler # -# -fgenerics switches on generation of support code for +# -XGenerics switches on generation of support code for # derivable type classes. This is now off by default, # but we switch it on for the libraries so that we generate # the code in case someone importing wants it -GhcLibHcOpts=-O2 -Rghc-timing -fgenerics +GhcLibHcOpts=-O2 -Rghc-timing -XGenerics # Win32 only: Enable the RTS and libraries to be built as DLLs DLLized=@EnableWin32DLLs@ @@ -442,10 +437,6 @@ SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\ # Math library LIBM=@LIBM@ -# Build the ObjectIO ? -# -GhcLibsWithObjectIO=@GhcLibsWithObjectIO@ - # .NET interop support? # DotnetSupport=@DotnetSupport@ @@ -468,7 +459,8 @@ GhcRtsWithFrontPanel = NO # Include support for CPU performance counters via the PAPI library in the RTS? # (PAPI: http://icl.cs.utk.edu/papi/) GhcRtsWithPapi = NO -HavePapi = @HavePapi@ +PapiLibDir= +PapiIncludeDir= ################################################################################ # @@ -633,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 @@ -699,7 +688,7 @@ SRC_LINT_OPTS += -axz -DLINT $(SRC_CPP_OPTS) WAY$(_way)_LINT_OPTS += WAY$(_way)_CPP_OPTS # Default fptools options for dllwrap. -SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32 +SRC_BLD_DLL_OPTS += --target=i386-mingw32 # Flags for CPP when running GreenCard on .pgc files GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__ @@ -719,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 @@ -763,7 +752,7 @@ GHC_UNLIT_DIR = $(FPTOOLS_TOP)/$(GHC_UNLIT_DIR_REL) GHC_HP2PS_DIR = $(FPTOOLS_TOP)/$(GHC_HP2PS_DIR_REL) GHC_HSTAGS_DIR = $(FPTOOLS_TOP)/$(GHC_HSTAGS_DIR_REL) GHC_GHCTAGS_DIR = $(FPTOOLS_TOP)/$(GHC_GHCTAGS_DIR_REL) -GHC_HSC2HS_DIR = $(FPTOOLS_TOP)/$(GHC_HSC2HS_DIR_REL) +GHC_HSC2HS_DIR = $(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL) GHC_TOUCHY_DIR = $(FPTOOLS_TOP)/$(GHC_TOUCHY_DIR_REL) GHC_PKG_DIR = $(FPTOOLS_TOP)/$(GHC_PKG_DIR_REL) GHC_GENPRIMOP_DIR = $(FPTOOLS_TOP)/$(GHC_GENPRIMOP_DIR_REL) @@ -796,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) @@ -811,12 +801,11 @@ GHC_UNLIT_PGM = unlit$(exeext) GHC_HP2PS_PGM = hp2ps GHC_HSTAGS_PGM = hasktags GHC_GHCTAGS_INPLACE_PGM = ghctags-inplace -GHC_HSC2HS_INPLACE_PGM = hsc2hs-inplace +GHC_HSC2HS_INPLACE_PGM = hsc2hs 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 @@ -837,11 +826,11 @@ UNLIT = $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM) HP2PS = $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM) HSTAGS = $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM) GHCTAGS_INPLACE = $(GHC_GHCTAGS_DIR)/$(GHC_GHCTAGS_INPLACE_PGM) -HSC2HS_INPLACE = $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM) +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) @@ -878,10 +867,14 @@ 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 # NOTE: add -no-user-package-conf for stage 1-3 above, so that # we avoid picking up any packages the user might happen to have @@ -905,11 +898,14 @@ GhcMinVersion = @GhcMinVersion@ ghc_ge_605 = YES ghc_ge_607 = YES +ghc_ge_609 = YES else # not UseStage1 or BootingFromHc HC = @WithHc@ MKDEPENDHS = $(GHC) +BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS = -package-conf $(BOOTSTRAPPING_CONF) +BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS = -package-conf $(BOOTSTRAPPING_CONF) GhcVersion = @GhcVersion@ GhcPatchLevel = @GhcPatchLevel@ GhcMajVersion = @GhcMajVersion@ @@ -918,6 +914,7 @@ GhcMinVersion = @GhcMinVersion@ # Some useful GHC version predicates: ghc_ge_605 = @ghc_ge_605@ ghc_ge_607 = @ghc_ge_607@ +ghc_ge_609 = @ghc_ge_609@ endif # Canonicalised ghc version number, used for easy (integer) version @@ -956,6 +953,16 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux" SRC_CC_OPTS += -G0 endif +SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS))) + +# Given +# foo bar +# make +# :\"-Ifoo\":\"-Ibar\" +nothing= +space=$(nothing) $(nothing) +SRC_HSC2HS_OPTS += $(subst $(space),,$(foreach d,$(GMP_INCLUDE_DIRS),:\"-I$(d)\")) + #----------------------------------------------------------------------------- # GMP Library (version 2.0.x or above) #