X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=9034773f0fd153bc2f3cf27e0a3445e081487d9a;hb=c4ec8f2a77894af1c6160c4e8ad5625ab62f0bea;hp=3749b3eda88191b7f2b7da1f0f6191e61ba1738e;hpb=eae65ca88fc09342e295874fb253f83775c61051;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 3749b3e..9034773 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -185,6 +185,12 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@ # XMLDocWays= +# Should we build haddock docs? +HADDOCK_DOCS = YES + +# Should we build latex docs? +LATEX_DOCS = NO + # Mac OS X deployment target (to cross-compile for older OS versions) # MACOSX_DEPLOYMENT_VERSION = @MACOSX_DEPLOYMENT_VERSION@ @@ -241,6 +247,12 @@ GhcStage3HcOpts=-O2 GhcProfiled=NO GhcDebugged=NO +GhcLibProfiled=NO + +# Build shared and/or static libs? +BuildSharedLibs=@BuildSharedLibs@ +# ToDo later: +# BuildStaticLibs=@BuildStaticLibs@ # Build a compiler that will build *unregisterised* libraries and # binaries by default. Unregisterised code is supposed to compile and @@ -277,9 +289,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 +358,6 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS))) HscIfaceFileVersion=6 -MakefileDeps=YES - #------------------------------------------------------------------------------ # Options for Libraries @@ -367,6 +374,10 @@ else GhcLibWays=p endif +ifeq "$(BuildSharedLibs)" "YES" +GhcLibWays += dyn +endif + # In addition, the RTS is built in some further variations. Ways that # make sense here: # @@ -386,6 +397,10 @@ ifeq "$(BootingFromHc)" "NO" GhcRTSWays += debug endif +ifeq "$(BuildSharedLibs)" "YES" +GhcRTSWays += debug_dyn thr_dyn thr_debug_dyn +endif + # Want the threaded versions unless we're unregisterised # Defer the check until later by using $(if..), because GhcUnregisterised might # be set in build.mk, which hasn't been read yet. @@ -442,10 +457,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@ @@ -527,14 +538,19 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" DEFAULT_TMPDIR = /C/TEMP endif -# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. +# FPTOOLS_TOP_ABS: the top of the fptools hierarchy, absolute path. # On Windows this is a c:/foo/bar style path. FPTOOLS_TOP_ABS = @hardtop@ -BIN_DIST_NAME=ghc-$(ProjectVersion) BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS) BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME) -BIN_DIST_TARBALL=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2 + +BIN_DIST_NAME=ghc-$(ProjectVersion) +BIN_DIST_TAR=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar +BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2 +BIN_DIST_PREP_DIR=$(FPTOOLS_TOP_ABS)/bindist-prep +BIN_DIST_PREP=$(BIN_DIST_PREP_DIR)/$(BIN_DIST_NAME) +BIN_DIST_LIST=$(FPTOOLS_TOP_ABS)/bindist-list # Definition of installation directories, we don't use half of these, but since # the configure script has them on offer while passing through, we might as well @@ -601,9 +617,14 @@ else # Unix: override libdir and datadir to put ghc-specific stuff in # a subdirectory with the version number included. +# +# datadir is set to libdir here as GHC needs package.conf and unlit +# to be in the same place (and things like ghc-pkg need to agree on +# where package.conf is, so we just set it globally). +# datarootdir := $(datadir0) -datadir := $(datadir0)/ghc-$(ProjectVersion) libdir := $(libdir0)/ghc-$(ProjectVersion) +datadir := $(libdir) # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags. # However, in order to support older autoconf's we don't use them. @@ -634,10 +655,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 @@ -700,7 +718,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__ @@ -720,7 +738,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 @@ -746,6 +764,8 @@ GHC_MANGLER_DIR_REL = $(GHC_DRIVER_DIR_REL)/mangler GHC_SPLIT_DIR_REL = $(GHC_DRIVER_DIR_REL)/split GHC_SYSMAN_DIR_REL = $(GHC_RTS_DIR_REL)/parallel +INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir + GHC_UTILS_DIR = $(FPTOOLS_TOP)/$(GHC_UTILS_DIR_REL) GHC_INCLUDE_DIR = $(FPTOOLS_TOP)/$(GHC_INCLUDE_DIR_REL) GHC_COMPILER_DIR = $(FPTOOLS_TOP)/$(GHC_COMPILER_DIR_REL) @@ -764,7 +784,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) @@ -797,6 +817,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) @@ -812,12 +833,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 @@ -838,11 +858,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) @@ -879,10 +899,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/ghc +GHC_STAGE2 = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/ghc +GHC_STAGE3 = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/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 @@ -914,13 +936,22 @@ 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@ GhcMinVersion = @GhcMinVersion@ +# We build a few packages using the installed GHC as part of the +# bootstrapping process. These are installed into a local +# package.conf file, $(BOOTSTRAPPING_CONF). When we invoke the +# installed GHC we need to pass it -package-conf $(BOOTSTRAPPING_CONF). +# So the following variables expand to -package-conf $(BOOTSTRAPPING_CONF) +# when $(HC) does *not* point to one of the GHC binaries built in +# the local tree. +# +BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =$(if $(findstring $(GHC_COMPILER_DIR_ABS), $(HC)),,-package-conf $(BOOTSTRAPPING_CONF)) +BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS =$(if $(findstring $(GHC_COMPILER_DIR_ABS), $(MKDEPENDHS)),,-package-conf $(BOOTSTRAPPING_CONF)) + # Some useful GHC version predicates: ghc_ge_605 = @ghc_ge_605@ ghc_ge_607 = @ghc_ge_607@ @@ -963,6 +994,9 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux" SRC_CC_OPTS += -G0 endif +SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS))) +SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d)) + #----------------------------------------------------------------------------- # GMP Library (version 2.0.x or above) # @@ -1158,11 +1192,6 @@ ALEX_VERSION = @AlexVersion@ GHC_ALEX_OPTS = -g # -# Haddock -# -HADDOCK = @HaddockCmd@ - -# # Options for compiling in different `ways'. # # To configure up your own way, have a look at some of the standard ways