[commit: ghc] master: compiler/ghc.mk: restore GhcHcOpts variable handling (Trac #8787) (423caa8)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/423caa85db277a63df8c2aa071cada82d2181b6e/ghc

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

commit 423caa85db277a63df8c2aa071cada82d2181b6e
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Wed Jul 2 08:54:06 2014 -0500

    compiler/ghc.mk: restore GhcHcOpts variable handling (Trac #8787)
    
    Summary:
    wiki and mk/config.mk.in suggests setting GhcHcOpts
    for compiler-wide haskell flags. But it does not
    work for a while now (broke around ca07d92837fc1e3ae9be67bb7d9e7f1b8035b00f)
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    
    Test Plan: 'make' shows now ghc timing as it used to be
    
    Reviewers: simonmar, austin
    
    Reviewed By: austin
    
    Subscribers: simonmar, relrod, carter
    
    Differential Revision: https://phabricator.haskell.org/D29


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

423caa85db277a63df8c2aa071cada82d2181b6e
 compiler/ghc.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 389543f..c236bcf 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -665,9 +665,9 @@ compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci
 compiler_stage3_CONFIGURE_OPTS += --disable-library-for-ghci
 
 # after build-package, because that sets compiler_stage1_HC_OPTS:
-compiler_stage1_HC_OPTS += $(GhcStage1HcOpts)
-compiler_stage2_HC_OPTS += $(GhcStage2HcOpts)
-compiler_stage3_HC_OPTS += $(GhcStage3HcOpts)
+compiler_stage1_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
+compiler_stage2_HC_OPTS += $(GhcHcOpts) $(GhcStage2HcOpts)
+compiler_stage3_HC_OPTS += $(GhcHcOpts) $(GhcStage3HcOpts)
 
 ifneq "$(BINDIST)" "YES"