Commit 3241a631 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Include build.mk or validate{,-settings}.mk through custom-settings.mk

parent fb167775
# Local GHC-build-tree customization for Cabal makefiles. We want to build
# libraries using flags that the user has put in build.mk.
# libraries using flags that the user has put in build.mk/validate.mk.
# Careful here: including boilerplate.mk breaks things, because paths.mk and
# opts.mk overrides some of the variable settings in the Cabal Makefile, so
# we just include config.mk and build.mk.
# we just include config.mk and custom-settings.mk.
TOP=../..
SAVE_GHC := $(GHC)
SAVE_AR := $(AR)
SAVE_LD := $(LD)
include $(TOP)/mk/config.mk
-include $(TOP)/mk/build.mk
include $(TOP)/mk/custom-settings.mk
GHC := $(SAVE_GHC)
AR := $(SAVE_AR)
LD := $(SAVE_LD)
......
......@@ -70,14 +70,8 @@ ifeq "$(BootingFromHc)" "YES"
include $(TOP)/mk/bootstrap.mk
endif
ifeq "$(Validating)" "YES"
include $(TOP)/mk/validate-settings.mk
-include $(TOP)/mk/validate.mk
else
-include $(TOP)/mk/build.mk
# (Optional) build-specific configuration
#
endif
include $(TOP)/mk/custom-settings.mk
ifndef FAST
-include .depend
......
ifeq "$(Validating)" "YES"
include $(TOP)/mk/validate-settings.mk
-include $(TOP)/mk/validate.mk
else
-include $(TOP)/mk/build.mk
endif
Supports Markdown
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