[commit: ghc] master: Improve the GhcLibWays sanity checking (84d527b)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/84d527bb46d9c820ba4f52f4f28393d890575221 >--------------------------------------------------------------- commit 84d527bb46d9c820ba4f52f4f28393d890575221 Author: Ian Lynagh <[email protected]> Date: Fri Oct 26 18:31:26 2012 +0100 Improve the GhcLibWays sanity checking >--------------------------------------------------------------- ghc.mk | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ghc.mk b/ghc.mk index 8e530e2..13f0db2 100644 --- a/ghc.mk +++ b/ghc.mk @@ -129,8 +129,14 @@ include mk/ways.mk include mk/custom-settings.mk ifeq "$(findstring clean,$(MAKECMDGOALS))" "" -ifeq "$(GhcLibWays)" "" -$(error $$(GhcLibWays) is empty, it must contain at least one way) +ifeq "$(DYNAMIC_BY_DEFAULT)" "YES" +ifeq "$(findstring dyn,$(GhcLibWays))" "" +$(error dyn is not in $$(GhcLibWays), but $$(DYNAMIC_BY_DEFAULT) is YES) +endif +else +ifeq "$(findstring v,$(GhcLibWays))" "" +$(error v is not in $$(GhcLibWays), and $$(DYNAMIC_BY_DEFAULT) is not YES) +endif endif endif