Build system: fix `make -j1` (#10973)
authorThomas Miedema <thomasmiedema@gmail.com>
Fri, 16 Oct 2015 18:28:05 +0000 (20:28 +0200)
committerThomas Miedema <thomasmiedema@gmail.com>
Sat, 17 Oct 2015 09:20:53 +0000 (11:20 +0200)
There are multiple hacks all over the build system to account for the
fact that the ghc package uses different build subdirectories
(stage1/stage2) than the other packages (dist/dist-install).

One such hack filtered on 'ghc%', with the intention of filtering the
ghc package only. After renaming bin-package-db to ghc-boot
(d2f9972a35ce05ceb8a78893e433ef1df06f73ef, Phab:D1313, #10796), ghc-boot
also got caught in the hack, which broke the build when running without
parallelism.

This patch replaces the before mentioned hack by a different one, such
that filtering on 'ghc%' is no longer necessary. See Note [inconsistent
distdirs].

Reviewed by: austin

Differential Revision: https://phabricator.haskell.org/D1333

rules/build-package-way.mk
rules/build-package.mk
rules/build-prog.mk

index 2257821..2dc43ff 100644 (file)
@@ -36,11 +36,15 @@ endif
 endif
 
 # Note [inconsistent distdirs]
+#
 # hack: the DEPS_LIBS mechanism assumes that the distdirs for packages
 # that depend on each other are the same, but that is not the case for
 # ghc where we use stage1/stage2 rather than dist/dist-install.
 # Really we should use a consistent scheme for distdirs, but in the
 # meantime we work around it by defining ghc-<ver>_dist-install_way_LIB:
+#
+# A similar hack is applied to the PROGRAM_DEP_LIB mechanism in
+# rules/build-package.mk.
 ifeq "$$($1_PACKAGE) $2" "ghc stage2"
 $$($1_$2_COMPONENT_ID)_dist-install_$3_LIB = $$($1_$2_$3_LIB)
 endif
index b514102..688e1d2 100644 (file)
@@ -135,6 +135,14 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \
 $1_$2_PROGRAM_DEP_LIB = $$($1_$2_v_LIB) $$($1_$2_dyn_LIB)
 $$($1_$2_COMPONENT_ID)_$2_PROGRAM_DEP_LIB = $$($1_$2_PROGRAM_DEP_LIB)
 
+# See Note [inconsistent distdirs] in rules/build-package-way.mk.
+ifeq "$$($1_PACKAGE) $2" "ghc stage1"
+$$($1_$2_COMPONENT_ID)_dist-boot_PROGRAM_DEP_LIB = $$($1_$2_PROGRAM_DEP_LIB)
+endif
+ifeq "$$($1_PACKAGE) $2" "ghc stage2"
+$$($1_$2_COMPONENT_ID)_dist-install_PROGRAM_DEP_LIB = $$($1_$2_PROGRAM_DEP_LIB)
+endif
+
 # C and S files are possibly built the "dyn" way.
 ifeq "$$(BuildSharedLibs)" "YES"
 $(call c-objs,$1,$2,dyn)
index 52036c6..2a2049b 100644 (file)
@@ -190,12 +190,7 @@ ifneq "$$(BINDIST)" "YES"
 # necessarily set when this part of the makefile is read
 $1/$2/build/tmp/$$($1_$2_PROG) $1/$2/build/tmp/$$($1_$2_PROG).dll : \
     $$(foreach dep,$$($1_$2_DEP_COMPONENT_IDS),\
-        $$(if $$(filter ghc%,$$(dep)),\
-            $(if $(filter 0,$3),$$(compiler_stage1_PROGRAM_DEP_LIB),\
-            $(if $(filter 1,$3),$$(compiler_stage2_PROGRAM_DEP_LIB),\
-            $(if $(filter 2,$3),$$(compiler_stage2_PROGRAM_DEP_LIB),\
-            $$(error Bad build stage)))),\
-        $$$$($$(dep)_dist-$(if $(filter 0,$3),boot,install)_PROGRAM_DEP_LIB)))
+        $$$$($$(dep)_dist-$(if $(filter 0,$3),boot,install)_PROGRAM_DEP_LIB))
 
 $1_$2_PROG_NEEDS_C_WRAPPER = NO
 $1_$2_PROG_INPLACE = $$($1_$2_PROG)