merge GHC HEAD

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

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index dda78aa..5cc10dc 100644 (file)
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -11,6 +11,8 @@
 # -----------------------------------------------------------------------------
 
 define shell-wrapper
+$(call trace, shell-wrapper($1,$2))
+$(call profStart, shell-wrapper($1,$2))
 # $1 = dir
 # $2 = distdir
 
@@ -32,13 +34,17 @@ endif
 ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
 all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
 
-$$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
+$$(INPLACE_BIN)/$$($1_$2_PROG): WRAPPER=$$@
+$$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE) $$($1_$2_SHELL_WRAPPER_NAME)
        "$$(RM)" $$(RM_OPTS)                              $$@
        echo '#!$$(SHELL)'                             >> $$@
        echo 'executablename="$$(TOP)/$$<"'            >> $$@
        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)               >> $$@
        $$(EXECUTABLE_FILE)                               $$@
 endif
@@ -58,7 +64,7 @@ install: install_$1_$2_wrapper
 .PHONY: install_$1_$2_wrapper
 install_$1_$2_wrapper: WRAPPER=$$(DESTDIR)$$(bindir)/$$($1_$2_INSTALL_SHELL_WRAPPER_NAME)
 install_$1_$2_wrapper:
-       $$(INSTALL_DIR) $$(DESTDIR)$$(bindir)
+       $$(call INSTALL_DIR,"$$(DESTDIR)$$(bindir)")
        "$$(RM)" $$(RM_OPTS)                                        "$$(WRAPPER)"
        $$(CREATE_SCRIPT)                                           "$$(WRAPPER)"
        echo '#!$$(SHELL)'                                       >> "$$(WRAPPER)"
@@ -68,6 +74,8 @@ install_$1_$2_wrapper:
        echo 'datadir="$$(datadir)"'                             >> "$$(WRAPPER)"
        echo 'bindir="$$(bindir)"'                               >> "$$(WRAPPER)"
        echo 'topdir="$$(topdir)"'                               >> "$$(WRAPPER)"
+       $$($1_$2_SHELL_WRAPPER_EXTRA)
+       $$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA)
        cat $$($1_$2_SHELL_WRAPPER_NAME)                         >> "$$(WRAPPER)"
        $$(EXECUTABLE_FILE)                                         "$$(WRAPPER)"
 
@@ -77,4 +85,5 @@ endif
 
 endif # $1_$2_SHELL_WRAPPER
 
+$(call profEnd, shell-wrapper($1,$2))
 endef