X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fpackage-config.mk;h=2091779d1e2b436696007660284c0205e8148d02;hb=9176377bf7d989919fe7d27cad1f56bd9c4e7b6b;hp=871fde677542f417a19622497d8b02c6d078a70b;hpb=a3be88fd60cc63b97ec8509f46a8d93025760792;p=ghc-hetmet.git diff --git a/rules/package-config.mk b/rules/package-config.mk index 871fde6..2091779 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -13,6 +13,7 @@ define package-config # args: $1 = dir, $2 = distdir, $3 = GHC stage $(call trace, package-config($1,$2,$3)) +$(call profStart, package-config($1,$2,$3)) $1_$2_HC = $$(GHC_STAGE$3) @@ -31,9 +32,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,11 +49,12 @@ $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 $1_$2_SLASH_MODS = $$(subst .,/,$$($1_$2_MODULES)) +$(call profEnd, package-config($1,$2,$3)) endef