Commit ef378f7c authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix cleaning and installing the libraries

When cleaning or installing, we need to ignore what $stage is, and
just clean/install all the libraries.
parent a2336415
...@@ -40,11 +40,24 @@ ifeq "$(stage)" "" ...@@ -40,11 +40,24 @@ ifeq "$(stage)" ""
stage := 1 stage := 1
endif endif
DO_STAGE_1_LIBS := NO
DO_STAGE_2_LIBS := NO
ifeq "$(stage)" "1"
DO_STAGE_1_LIBS := YES
endif
ifeq "$(stage)" "2"
DO_STAGE_2_LIBS := YES
endif
ifneq "$(filter install clean,$(MAKECMDGOALS))" ""
DO_STAGE_1_LIBS := YES
DO_STAGE_2_LIBS := YES
endif
# Any libraries listed here should also be in ../packages # Any libraries listed here should also be in ../packages
SUBDIRS := SUBDIRS :=
ifeq "$(stage)" "1" ifeq "$(DO_STAGE_1_LIBS)" "YES"
SUBDIRS += ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring SUBDIRS += ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring
SUBDIRS += containers bytestring old-locale old-time filepath SUBDIRS += containers bytestring old-locale old-time filepath
ifeq "$(GhcLibsWithUnix)" "YES" ifeq "$(GhcLibsWithUnix)" "YES"
...@@ -75,7 +88,7 @@ SUBDIRS += $(wildcard parallel) ...@@ -75,7 +88,7 @@ SUBDIRS += $(wildcard parallel)
endif endif
endif endif
ifeq "$(stage)" "2" ifeq "$(DO_STAGE_2_LIBS)" "YES"
ifneq "$(GhcBootLibs)" "YES" ifneq "$(GhcBootLibs)" "YES"
ifneq "$(wildcard dph)" "" ifneq "$(wildcard dph)" ""
SUBDIRS += dph/dph-base SUBDIRS += dph/dph-base
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment