diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-29 16:19:33 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-29 16:19:33 +0100 |
| commit | 0a8a41c09aa4c331fdec25aff418d0c8f4468d27 (patch) | |
| tree | 1423e5b87ec0d466b3257e0b979ec03b43c7d797 | |
| parent | a8ea6721b0477d76ec00e5daa698a5cf9cb89600 (diff) | |
| download | haskell-0a8a41c09aa4c331fdec25aff418d0c8f4468d27.tar.gz | |
We no longer need to pass pgmc etc in the ghc.wrapper script
They can now be set in the settings file instead
| -rw-r--r-- | ghc/ghc.wrapper | 2 | ||||
| -rw-r--r-- | rules/shell-wrapper.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ghc/ghc.wrapper b/ghc/ghc.wrapper index 5003f9ae40..083a66db7e 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 64339576c6..5cc10dc347 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)" |