projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tell Cabal where gcc is
[ghc-hetmet.git]
/
mk
/
cabal-flags.mk
diff --git
a/mk/cabal-flags.mk
b/mk/cabal-flags.mk
index
c9663aa
..
b50702d
100644
(file)
--- a/
mk/cabal-flags.mk
+++ b/
mk/cabal-flags.mk
@@
-7,6
+7,7
@@
UTILS_ABS = $(FPTOOLS_TOP_ABS)/utils
CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
INSTALL_PACKAGE = \
$(UTILS_ABS)/installPackage/install-inplace/bin/installPackage
CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
INSTALL_PACKAGE = \
$(UTILS_ABS)/installPackage/install-inplace/bin/installPackage
+STAGE3_PACKAGE_CONF = $(FPTOOLS_TOP_ABS)/stage3.package.conf
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
@@
-14,9
+15,10
@@
FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
$(space)--configure-option=',\
$(space)$(CONFIGURE_ARGS))
$(space)--configure-option=',\
$(space)$(CONFIGURE_ARGS))
-COMMON_CONFIGURE_FLAGS = \
- --libsubdir='$$pkgid' \
- --with-ld=$(LD) \
+COMMON_CONFIGURE_FLAGS = \
+ --libsubdir='$$pkgid' \
+ --with-gcc=$(WhatGccIsCalled) \
+ --with-ld=$(LD) \
$(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
ifneq "$(HSCOLOUR)" ""
$(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
ifneq "$(HSCOLOUR)" ""
@@
-60,8
+62,12
@@
INSTALL_DIRS_CONFIGURE_FLAGS = \
--haddockdir=$(NONEXISTENT) \
--htmldir=$(NONEXISTENT)
--haddockdir=$(NONEXISTENT) \
--htmldir=$(NONEXISTENT)
+INPLACE_GHC_DATADIR_CONFIGURE_FLAGS = \
+ --datadir=$(FPTOOLS_TOP_ABS)/inplace-datadir \
+ --datasubdir=.
+
INPLACE_DIRS_CONFIGURE_FLAGS = \
INPLACE_DIRS_CONFIGURE_FLAGS = \
- --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace
+ --prefix=`$(FPTOOLS_TOP_ABS)/utils/pwd/pwd forwardslash`/install-inplace
USE_BOOT_CONFIGURE_FLAGS = \
--with-compiler=$(GHC) \
USE_BOOT_CONFIGURE_FLAGS = \
--with-compiler=$(GHC) \
@@
-69,7
+75,7
@@
USE_BOOT_CONFIGURE_FLAGS = \
--package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
USE_STAGE_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))
$(addprefix --cc-option=,$(MACOSX_DEPLOYMENT_CC_OPTS)) \
$(addprefix --ld-option=,$(MACOSX_DEPLOYMENT_LD_OPTS))
@@
-77,9
+83,10
@@
USE_STAGE1_CONFIGURE_FLAGS = \
--with-compiler=$(GHC_STAGE1) \
$(USE_STAGE_CONFIGURE_FLAGS)
--with-compiler=$(GHC_STAGE1) \
$(USE_STAGE_CONFIGURE_FLAGS)
-USE_STAGE2_CONFIGURE_FLAGS = \
- --with-compiler=$(GHC_STAGE2) \
- $(USE_STAGE_CONFIGURE_FLAGS)
+USE_STAGE2_CONFIGURE_FLAGS = \
+ --with-compiler=$(GHC_STAGE2) \
+ $(USE_STAGE_CONFIGURE_FLAGS) \
+ --package-db $(STAGE3_PACKAGE_CONF)
BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))
BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))