[commit: ghc] cross-compiler-alienless: make sure that the C compiler is noted in the cross-ghc's wrapper (420aff3)
Gabor Greif
ggreif at gmail.com
Fri Aug 31 14:58:35 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : cross-compiler-alienless
http://hackage.haskell.org/trac/ghc/changeset/420aff3ab85d9b0102de636de3244d9d1fa68abc
>---------------------------------------------------------------
commit 420aff3ab85d9b0102de636de3244d9d1fa68abc
Author: Gabor Greif <ggreif at gmail.com>
Date: Fri Aug 31 14:34:44 2012 +0200
make sure that the C compiler is noted in the cross-ghc's wrapper
>---------------------------------------------------------------
rules/shell-wrapper.mk | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index 2f27357..55eabfa 100644
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -36,8 +36,10 @@ all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
ifeq "$(BuildingCrossCompiler)" "YES"
$1_$2_PGMGCC = $$(CC_STAGE1)
+$1_$2_INSTALL_CROSS_SHELL_WRAPPER_EXTRA = (echo 'pgmgcc="$$($1_$2_PGMGCC)"'; echo)
else
$1_$2_PGMGCC = $$(WhatGccIsCalled)
+$1_$2_INSTALL_CROSS_SHELL_WRAPPER_EXTRA = echo
endif
@@ -83,6 +85,7 @@ install_$1_$2_wrapper:
echo 'topdir="$$(topdir)"' >> "$$(WRAPPER)"
$$($1_$2_SHELL_WRAPPER_EXTRA)
$$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA)
+ $$($1_$2_INSTALL_CROSS_SHELL_WRAPPER_EXTRA) >> "$$(WRAPPER)"
cat $$($1_$2_SHELL_WRAPPER_NAME) >> "$$(WRAPPER)"
$$(EXECUTABLE_FILE) "$$(WRAPPER)"
More information about the Cvs-ghc
mailing list