diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-18 11:47:53 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-18 11:47:53 +0000 |
| commit | eed437cdefb952e6c70e58012b23d436e74710af (patch) | |
| tree | 712e227f0461bae88a31ab0409e7d6c678cb81e3 /mk | |
| parent | 249bcf1f34e240a39abbcbb29bd6b97ddece421f (diff) | |
| download | haskell-eed437cdefb952e6c70e58012b23d436e74710af.tar.gz | |
More build system changes; ghc-pkg is now built with Cabal
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cabal-flags.mk | 7 | ||||
| -rw-r--r-- | mk/config.mk.in | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index c9663aa5ce..4483dc63d1 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -56,12 +56,15 @@ INSTALL_DIRS_CONFIGURE_FLAGS = \ --libdir=$(NONEXISTENT) \ --libexecdir=$(NONEXISTENT) \ --datadir=$(NONEXISTENT) \ + --datasubdir=. \ --docdir=$(NONEXISTENT) \ --haddockdir=$(NONEXISTENT) \ --htmldir=$(NONEXISTENT) INPLACE_DIRS_CONFIGURE_FLAGS = \ - --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace + --prefix=`$(FPTOOLS_TOP_ABS)/utils/pwd/pwd forwardslash`/install-inplace \ + --datadir=$(FPTOOLS_TOP_ABS)/inplace-datadir \ + --datasubdir=. USE_BOOT_CONFIGURE_FLAGS = \ --with-compiler=$(GHC) \ @@ -69,7 +72,7 @@ USE_BOOT_CONFIGURE_FLAGS = \ --package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf USE_STAGE_CONFIGURE_FLAGS = \ - --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \ + --with-hc-pkg=$(GHC_PKG_INPLACE) \ $(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \ $(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS)) diff --git a/mk/config.mk.in b/mk/config.mk.in index f3a23243ff..3391f1788c 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -625,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 @@ -809,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 @@ -834,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) |