[commit: hsc2hs] master: remove HSC2HS_EXTRA options from stage0 wrapper for hsc2hs (46abf34)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/hsc2hs

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/46abf34f337dbc5fa638f06912e34966a9d1a147

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

commit 46abf34f337dbc5fa638f06912e34966a9d1a147
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Apr 21 18:17:24 2013 +0100

    remove HSC2HS_EXTRA options from stage0 wrapper for hsc2hs
    
    Patch from Stephen Blackheath.
    
    The inplace hsc2hs is used for all stages, so we can't bake the
    stage 0 options into it. The build system passes the right flags
    anyway.

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

 ghc.mk |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 3d8f49f..68b348e 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -21,9 +21,11 @@ utils/hsc2hs_dist-install_MODULES = $(utils/hsc2hs_dist_MODULES)
 
 utils/hsc2hs_template=$(INPLACE_TOPDIR)/template-hsc.h
 
-define utils/hsc2hs_dist_SHELL_WRAPPER_EXTRA
-echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS_STAGE0)) $(addprefix --lflag=,$(CONF_GCC_LINKER_OPTS_STAGE0)) -I$(TOP)/includes"' >> "$(WRAPPER)"
-endef
+# Here we encode the cc and linker options into the wrapper for the released
+# hsc2hs binary using a HSC2HS_EXTRA variable.
+# For the stage0 wrapper (built in dist), we don't do this, because the build
+# system uses it for all stages and passes the right options for each stage
+# on the command line
 define utils/hsc2hs_dist-install_SHELL_WRAPPER_EXTRA
 echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS_STAGE1)) $(addprefix --lflag=,$(CONF_GCC_LINKER_OPTS_STAGE1))"' >> "$(WRAPPER)"
 endef