projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep separate linker flags, for when we want to link with gcc or ld
[ghc-hetmet.git]
/
rules
/
shell-wrapper.mk
diff --git
a/rules/shell-wrapper.mk
b/rules/shell-wrapper.mk
index
d2ff84d
..
6433957
100644
(file)
--- a/
rules/shell-wrapper.mk
+++ b/
rules/shell-wrapper.mk
@@
-11,6
+11,8
@@
# -----------------------------------------------------------------------------
define shell-wrapper
# -----------------------------------------------------------------------------
define shell-wrapper
+$(call trace, shell-wrapper($1,$2))
+$(call profStart, shell-wrapper($1,$2))
# $1 = dir
# $2 = distdir
# $1 = dir
# $2 = distdir
@@
-33,7
+35,7
@@
ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
$$(INPLACE_BIN)/$$($1_$2_PROG): WRAPPER=$$@
all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
$$(INPLACE_BIN)/$$($1_$2_PROG): WRAPPER=$$@
-$$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
+$$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE) $$($1_$2_SHELL_WRAPPER_NAME)
"$$(RM)" $$(RM_OPTS) $$@
echo '#!$$(SHELL)' >> $$@
echo 'executablename="$$(TOP)/$$<"' >> $$@
"$$(RM)" $$(RM_OPTS) $$@
echo '#!$$(SHELL)' >> $$@
echo 'executablename="$$(TOP)/$$<"' >> $$@
@@
-62,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:
.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)"
"$$(RM)" $$(RM_OPTS) "$$(WRAPPER)"
$$(CREATE_SCRIPT) "$$(WRAPPER)"
echo '#!$$(SHELL)' >> "$$(WRAPPER)"
@@
-84,4
+86,5
@@
endif
endif # $1_$2_SHELL_WRAPPER
endif # $1_$2_SHELL_WRAPPER
+$(call profEnd, shell-wrapper($1,$2))
endef
endef