From cc2e327cf8966a9e5d8d3f3d7ce1d0867f1627ec Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 16 Jan 2011 00:31:04 +0000 Subject: Change some HC_OPTS var handling In particular, this means ghc gets built with -rtsopt, -threaded, etc again. --- rules/package-config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rules/package-config.mk') diff --git a/rules/package-config.mk b/rules/package-config.mk index 871fde6775..f111e1efac 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -31,9 +31,9 @@ $1_$2_HC_DEP = $1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF) $1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF) $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF) -$1_$2_HC_OPTS += -no-user-package-conf +$1_$2_MORE_HC_OPTS += -no-user-package-conf ifeq "$(ghc_ge_613)" "YES" -$1_$2_HC_OPTS += -rtsopts +$1_$2_MORE_HC_OPTS += -rtsopts endif else $1_$2_ghc_ge_613 = YES @@ -48,8 +48,8 @@ $1_$2_GHC_PKG_OPTS = $1_$2_HC_MK_DEPEND = $$(GHC_STAGE1) $1_$2_HC_MK_DEPEND_DEP = $$($1_$2_HC_MK_DEPEND) $1_$2_HC_DEP = $$($1_$2_HC) -$1_$2_HC_OPTS += -no-user-package-conf -$1_$2_HC_OPTS += -rtsopts +$1_$2_MORE_HC_OPTS += -no-user-package-conf +$1_$2_MORE_HC_OPTS += -rtsopts endif # Useful later -- cgit v1.2.1