diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-03-24 17:14:08 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-03-24 17:14:08 +0000 |
| commit | 4a0b6d6cba4c6d053c928ecc111ff0a300443f4b (patch) | |
| tree | 6c5ad8e48d4a752cfb2d33104862b837a76a57ea /rules/shell-wrapper.mk | |
| parent | 1de47f21a9e3a1e8f3969a675f79c6dd56fa2dd2 (diff) | |
| download | haskell-4a0b6d6cba4c6d053c928ecc111ff0a300443f4b.tar.gz | |
Pass the location of gcc in the ghc wrapper script; partially fixes #3863
This means we don't rely on baking a path to gcc into the executable
Diffstat (limited to 'rules/shell-wrapper.mk')
| -rw-r--r-- | rules/shell-wrapper.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index c3358dfff6..d2ff84dc57 100644 --- 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 'pgmgcc="$$(WhatGccIsCalled)"' >> $$@ $$($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 'pgmgcc="$$(WhatGccIsCalled)"' >> "$$(WRAPPER)" $$($1_$2_SHELL_WRAPPER_EXTRA) $$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA) cat $$($1_$2_SHELL_WRAPPER_NAME) >> "$$(WRAPPER)" |