X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=7e2ce68471980edc2eb267ddee899221e5f00c1f;hb=5775d5142da227d65fb86994d363eb16841ee642;hp=9e2bae36288454c4eba72b57808b869f58f5eedd;hpb=a3be88fd60cc63b97ec8509f46a8d93025760792;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 9e2bae3..7e2ce68 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -64,6 +64,18 @@ define build-package-helper
 
 $(call package-config,$1,$2,$3)
 
+# Bootstrapping libs are only built one way
+ifeq "$3" "0"
+$1_$2_WAYS = v
+else
+$1_$2_WAYS = $$(GhcLibWays)
+endif
+
+# 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_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
+
 ########################################
 ifeq "$$($1_$2_CONFIGURE_PHASE)" ""
 $$(error No configure phase for $1_$2)
@@ -125,28 +137,12 @@ endif
 
 ifeq "$$(phase_$$($1_$2_CONFIGURE_PHASE)_done)" "YES"
 
-# Sometimes we need to modify the automatically-generated package-data.mk
-# bindings in a special way for the GHC build system, so allow that here:
-$($1_PACKAGE_MAGIC)
-
-# Bootstrapping libs are only built one way
-ifeq "$3" "0"
-$1_$2_WAYS = v
-else
-$1_$2_WAYS = $$(GhcLibWays)
-endif
-
 $(call hs-sources,$1,$2)
 $(call c-sources,$1,$2)
 $(call includes-sources,$1,$2)
 
 # --- DEPENDENCIES
 
-# 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_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
-
 $(call build-dependencies,$1,$2,$3)
 
 # --- BUILDING