[commit: ghc] master: Apply WERROR only to stage2 HC options (31bcf9b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/31bcf9b62ceaed98bdd3b7605e68d315bcff0c8a/ghc

>---------------------------------------------------------------

commit 31bcf9b62ceaed98bdd3b7605e68d315bcff0c8a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Nov 1 10:18:07 2015 +0100

    Apply WERROR only to stage2 HC options
    
    Otherwise validate unnecessarily may fail during the stage1 build when
    booting with an older compiler.
    
    Test Plan: Try it
    
    Reviewers: thomie, austin
    
    Reviewed By: thomie, austin
    
    Differential Revision: https://phabricator.haskell.org/D1390


>---------------------------------------------------------------

31bcf9b62ceaed98bdd3b7605e68d315bcff0c8a
 ghc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index bf521b2..07e1edc 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -143,7 +143,8 @@ include mk/warnings.mk
 # (Optional) build-specific configuration
 include mk/custom-settings.mk
 SRC_CC_OPTS     += $(WERROR)
-SRC_HC_OPTS     += $(WERROR)
+GhcStage2HcOpts += $(WERROR)
+GhcLibHcOpts    += $(WERROR)
 
 # -----------------------------------------------------------------------------
 # Check for inconsistent settings, after reading mk/build.mk.