Pass the location of gcc in the ghc wrapper script; partially fixes #3863

[ghc-hetmet.git] / rules / shell-wrapper.mk

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index c3358df..d2ff84d 100644 (file)
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -40,6 +40,7 @@ $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
        echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"'       >> $$@
        echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"'        >> $$@
        echo 'topdir="$$(TOP)/$$(INPLACE_TOPDIR)"'     >> $$@
        echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"'       >> $$@
        echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"'        >> $$@
        echo 'topdir="$$(TOP)/$$(INPLACE_TOPDIR)"'     >> $$@

+       echo 'pgmgcc="$$(WhatGccIsCalled)"'            >> $$@

        $$($1_$2_SHELL_WRAPPER_EXTRA)
        $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA)
        cat $$($1_$2_SHELL_WRAPPER_NAME)               >> $$@
        $$($1_$2_SHELL_WRAPPER_EXTRA)
        $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA)
        cat $$($1_$2_SHELL_WRAPPER_NAME)               >> $$@

@@ -71,6 +72,7 @@ install_$1_$2_wrapper:
        echo 'datadir="$$(datadir)"'                             >> "$$(WRAPPER)"
        echo 'bindir="$$(bindir)"'                               >> "$$(WRAPPER)"
        echo 'topdir="$$(topdir)"'                               >> "$$(WRAPPER)"
        echo 'datadir="$$(datadir)"'                             >> "$$(WRAPPER)"
        echo 'bindir="$$(bindir)"'                               >> "$$(WRAPPER)"
        echo 'topdir="$$(topdir)"'                               >> "$$(WRAPPER)"

+       echo 'pgmgcc="$$(WhatGccIsCalled)"'                      >> "$$(WRAPPER)"

        $$($1_$2_SHELL_WRAPPER_EXTRA)
        $$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA)
        cat $$($1_$2_SHELL_WRAPPER_NAME)                         >> "$$(WRAPPER)"
        $$($1_$2_SHELL_WRAPPER_EXTRA)
        $$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA)
        cat $$($1_$2_SHELL_WRAPPER_NAME)                         >> "$$(WRAPPER)"