Permalink
Browse files

We no longer need to pass pgmc etc in the ghc.wrapper script

They can now be set in the settings file instead
  • Loading branch information...
1 parent a8ea672 commit 0a8a41c09aa4c331fdec25aff418d0c8f4468d27 @igfoo igfoo committed Apr 29, 2011
Showing with 1 addition and 2 deletions.
  1. +1 −1 ghc/ghc.wrapper
  2. +0 −1 rules/shell-wrapper.mk
View
@@ -1 +1 @@
-exec "$executablename" -B"$topdir" -pgmc "$pgmgcc" -pgma "$pgmgcc" -pgml "$pgmgcc" -pgmP "$pgmgcc -E -undef -traditional" ${1+"$@"}
+exec "$executablename" -B"$topdir" ${1+"$@"}
@@ -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)"

0 comments on commit 0a8a41c

Please sign in to comment.