diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-26 11:06:29 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-26 11:06:29 +0100 |
| commit | 66ec09b7398291670914723b745fd5749eeeb15a (patch) | |
| tree | 849a16d6d9e48d4fc900ceada2b3f3935d710bb4 /mk | |
| parent | b6acaf08ff5740ecd9349db530db3b911badb71a (diff) | |
| parent | edb53036e4e978064c0cf7144ae7942c382766ea (diff) | |
| download | haskell-66ec09b7398291670914723b745fd5749eeeb15a.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk.sample | 3 | ||||
| -rw-r--r-- | mk/validate-settings.mk | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mk/build.mk.sample b/mk/build.mk.sample index 6ac5c56b5d..17fb9a1e56 100644 --- a/mk/build.mk.sample +++ b/mk/build.mk.sample @@ -30,8 +30,7 @@ # A development build, working on the stage 2 compiler: #BuildFlavour = devel2 -GhcLibWays = v -DYNAMIC_BY_DEFAULT = NO +GhcLibWays = $(if $(filter $(DYNAMIC_BY_DEFAULT),YES),dyn,v) # Uncomment this to get prettier build output. # Please use V = 1 when reporting GHC bugs. diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index 9eeb488572..bd582ff828 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -29,7 +29,7 @@ GhcLibHcOpts += -O -dcore-lint # We define DefaultFastGhcLibWays in this style so that the value is # correct even if the user alters DYNAMIC_BY_DEFAULT -DefaultFastGhcLibWays = $(if $(filter $(DYNAMIC_BY_DEFAULT),YES),v dyn,v) +DefaultFastGhcLibWays = $(if $(filter $(DYNAMIC_BY_DEFAULT),YES),dyn,v) ifeq "$(ValidateSpeed)" "FAST" GhcLibWays = $(DefaultFastGhcLibWays) |