From 0a8a41c09aa4c331fdec25aff418d0c8f4468d27 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Fri, 29 Apr 2011 16:19:33 +0100
Subject: [PATCH] We no longer need to pass pgmc etc in the ghc.wrapper script
They can now be set in the settings file instead
---
ghc/ghc.wrapper | 2 +-
rules/shell-wrapper.mk | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ghc/ghc.wrapper b/ghc/ghc.wrapper
index 5003f9ae400..083a66db7e7 100644
--- a/ghc/ghc.wrapper
+++ b/ghc/ghc.wrapper
@@ -1 +1 @@
-exec "$executablename" -B"$topdir" -pgmc "$pgmgcc" -pgma "$pgmgcc" -pgml "$pgmgcc" -pgmP "$pgmgcc -E -undef -traditional" ${1+"$@"}
+exec "$executablename" -B"$topdir" ${1+"$@"}
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index 64339576c6a..5cc10dc3470 100644
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -74,7 +74,6 @@ 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)"
--
GitLab