X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=f40d0fcf2516d78be6161f1d3b18b2214f6d94a8;hp=8e813892dfcefdbc30b916ce36e2fabff97062fe;hb=dc5b9bd64d1c1f544e4813dc946b5a83ad304cee;hpb=d4f9480c7e7bf8167a97ff964f9d85400398c5c4

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 8e81389..f40d0fc 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -68,7 +68,6 @@ clean_$1_$2_config:
 
 # --- CONFIGURATION
 
-$1_$2_USE_BOOT_LIBS = YES
 $(call package-config,$1,$2,$3)
 
 ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
@@ -89,7 +88,7 @@ $(call all-target,$1_$2,$1/$2/package-data.mk)
 ifneq "$$(BINDIST)" "YES"
 # We have a rule for package-data.mk only when the package is
 # disabled, because we want the build to fail if we haven't run phase 0.
-$(call build-package-data,$1,$2)
+$(call build-package-data,$1,$2,$3)
 endif
 
 else
@@ -120,7 +119,7 @@ $(call includes-sources,$1,$2)
 # We must use a different dependency file if $(GhcLibWays) changes, so
 # encode the ways into the name of the file.
 $1_$2_WAYS_DASHED = $$(subst $$(space),,$$(patsubst %,-%,$$(strip $$($1_$2_WAYS))))
-$1_$2_depfile = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
+$1_$2_depfile_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
 
 $(call build-dependencies,$1,$2)
 
@@ -135,10 +134,8 @@ $1_$2_SplitObjs = NO
 endif
 endif
 
-$(call distdir-opts,$1,$2,$3)
-
 # C and S files are possibly built the "dyn" way.
-ifeq "$(BuildSharedLibs)" "YES"
+ifeq "$$(BuildSharedLibs)" "YES"
 $(call c-objs,$1,$2,dyn)
 $(call c-suffix-rules,$1,$2,dyn,YES)
 endif