diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-22 09:11:17 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-22 09:11:17 +0100 |
| commit | b243d30b9cf5c78624f743f69e072a5dd46d9065 (patch) | |
| tree | d971c290e1429667f50bd3c4843e799259a45985 /mk | |
| parent | cd51b9ca85c095ea894568b1ca1eb0c8ad4b6f56 (diff) | |
| parent | 4f83f54144d95448bd68e01975f2edf9081bbdb7 (diff) | |
| download | haskell-b243d30b9cf5c78624f743f69e072a5dd46d9065.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk.sample | 4 | ||||
| -rw-r--r-- | mk/config.mk.in | 3 | ||||
| -rw-r--r-- | mk/ways.mk | 8 |
3 files changed, 14 insertions, 1 deletions
diff --git a/mk/build.mk.sample b/mk/build.mk.sample index 9a4026be48..6ac5c56b5d 100644 --- a/mk/build.mk.sample +++ b/mk/build.mk.sample @@ -33,6 +33,10 @@ GhcLibWays = v DYNAMIC_BY_DEFAULT = NO +# Uncomment this to get prettier build output. +# Please use V = 1 when reporting GHC bugs. +# V = 0 + # -------- 1. A Performance/Distribution build-------------------------------- ifeq "$(BuildFlavour)" "perf" diff --git a/mk/config.mk.in b/mk/config.mk.in index debfb165d5..366d511608 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -27,6 +27,9 @@ TOP = @hardtop@ include $(TOP)/mk/project.mk +# By default, be verbose +V = 1 + ################################################################################ # # Global configuration options diff --git a/mk/ways.mk b/mk/ways.mk index 2c125e6b7f..c3651163c7 100644 --- a/mk/ways.mk +++ b/mk/ways.mk @@ -22,7 +22,7 @@ # # The ways currently defined. # -ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug debug_p thr_debug_p l_dyn thr_l_dyn +ALL_WAYS=v p t l s mp mg debug dyn thr thr_l p_dyn debug_dyn thr_dyn thr_p_dyn thr_debug_dyn thr_p thr_debug debug_p thr_debug_p l_dyn thr_l_dyn # # The following ways currently have treated specially, p t mg, @@ -88,6 +88,12 @@ WAY_thr_debug_p_HC_OPTS= -static -optc-DTHREADED_RTS -optc-DDEBUG -prof WAY_dyn_NAME=dyn WAY_dyn_HC_OPTS=-fPIC -dynamic +WAY_p_dyn_NAME=p_dyn +WAY_p_dyn_HC_OPTS=-fPIC -dynamic -prof + +WAY_thr_p_dyn_NAME=thr_p_dyn +WAY_thr_p_dyn_HC_OPTS=-fPIC -dynamic -prof -optc-DTHREADED_RTS + # Way 'thr_dyn': WAY_thr_dyn_NAME=thr_dyn WAY_thr_dyn_HC_OPTS=-fPIC -dynamic -optc-DTHREADED_RTS |