projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5b3f16
)
Tweak how shell wrappers are built
author
Ian Lynagh
<igloo@earth.li>
Sat, 7 Nov 2009 20:50:42 +0000
(20:50 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sat, 7 Nov 2009 20:50:42 +0000
(20:50 +0000)
ghc/ghc.mk
patch
|
blob
|
history
rules/shell-wrapper.mk
patch
|
blob
|
history
diff --git
a/ghc/ghc.mk
b/ghc/ghc.mk
index
2f505cf
..
a3973bf
100644
(file)
--- a/
ghc/ghc.mk
+++ b/
ghc/ghc.mk
@@
-92,7
+92,7
@@
ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_NAME = ghc-$(ProjectVersion)
# We override the program name to be ghc, rather than ghc-stage2.
# This means the right program name is used in error messages etc.
define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
# We override the program name to be ghc, rather than ghc-stage2.
# This means the right program name is used in error messages etc.
define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
-echo 'executablename="$$$$exedir/ghc"' >> "$$(WRAPPER)"
+echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)"
endef
# stage 1 is enabled unless $(stage) is set to something other than 1
endef
# stage 1 is enabled unless $(stage) is set to something other than 1
diff --git
a/rules/shell-wrapper.mk
b/rules/shell-wrapper.mk
index
503a8d2
..
c3358df
100644
(file)
--- a/
rules/shell-wrapper.mk
+++ b/
rules/shell-wrapper.mk
@@
-32,6
+32,7
@@
endif
ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
+$$(INPLACE_BIN)/$$($1_$2_PROG): WRAPPER=$$@
$$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
"$$(RM)" $$(RM_OPTS) $$@
echo '#!$$(SHELL)' >> $$@
$$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
"$$(RM)" $$(RM_OPTS) $$@
echo '#!$$(SHELL)' >> $$@
@@
-39,8
+40,8
@@
$$(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)"' >> $$@
- $($1_$2_SHELL_WRAPPER_EXTRA)
- $($1_$2_INPLACE_SHELL_WRAPPER_EXTRA)
+ $$($1_$2_SHELL_WRAPPER_EXTRA)
+ $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA)
cat $$($1_$2_SHELL_WRAPPER_NAME) >> $$@
$$(EXECUTABLE_FILE) $$@
endif
cat $$($1_$2_SHELL_WRAPPER_NAME) >> $$@
$$(EXECUTABLE_FILE) $$@
endif
@@
-70,8
+71,8
@@
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)"
- $($1_$2_SHELL_WRAPPER_EXTRA)
- $($1_$2_INSTALL_SHELL_WRAPPER_EXTRA)
+ $$($1_$2_SHELL_WRAPPER_EXTRA)
+ $$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA)
cat $$($1_$2_SHELL_WRAPPER_NAME) >> "$$(WRAPPER)"
$$(EXECUTABLE_FILE) "$$(WRAPPER)"
cat $$($1_$2_SHELL_WRAPPER_NAME) >> "$$(WRAPPER)"
$$(EXECUTABLE_FILE) "$$(WRAPPER)"