diff --git a/ghc/ghc.wrapper b/ghc/ghc.wrapper index 5003f9ae4000d9a8a5f352e0e9e68997cbce21d8..083a66db7e7d55a0a3eeb887d5cf431533d0d678 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 64339576c6a62917f4209afefcb8be50571b76bd..5cc10dc3470ddbe195600dfea284aa4d351c721f 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)"