diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-03-24 17:14:08 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-03-24 17:14:08 +0000 |
| commit | 4a0b6d6cba4c6d053c928ecc111ff0a300443f4b (patch) | |
| tree | 6c5ad8e48d4a752cfb2d33104862b837a76a57ea | |
| parent | 1de47f21a9e3a1e8f3969a675f79c6dd56fa2dd2 (diff) | |
| download | haskell-4a0b6d6cba4c6d053c928ecc111ff0a300443f4b.tar.gz | |
Pass the location of gcc in the ghc wrapper script; partially fixes #3863
This means we don't rely on baking a path to gcc into the executable
| -rw-r--r-- | distrib/configure.ac.in | 7 | ||||
| -rw-r--r-- | ghc/ghc.wrapper | 2 | ||||
| -rw-r--r-- | rules/shell-wrapper.mk | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index 44a5517dfe..27109a2e1c 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -62,8 +62,13 @@ dnl ** Find the path to sed ** AC_PATH_PROG(SedCmd,sed) # -dnl ** How to invoke cpp directly ** +dnl ** How to invoke gcc/cpp ** # +FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) +export CC +WhatGccIsCalled="$CC" +AC_SUBST(WhatGccIsCalled) + FP_HAVE_GCC AC_PROG_CPP diff --git a/ghc/ghc.wrapper b/ghc/ghc.wrapper index 083a66db7e..db3ebb0fe7 100644 --- a/ghc/ghc.wrapper +++ b/ghc/ghc.wrapper @@ -1 +1 @@ -exec "$executablename" -B"$topdir" ${1+"$@"} +exec "$executablename" -B"$topdir" -pgmc "$pgmgcc" ${1+"$@"} diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index c3358dfff6..d2ff84dc57 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -40,6 +40,7 @@ $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE) echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"' >> $$@ echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"' >> $$@ echo 'topdir="$$(TOP)/$$(INPLACE_TOPDIR)"' >> $$@ + echo 'pgmgcc="$$(WhatGccIsCalled)"' >> $$@ $$($1_$2_SHELL_WRAPPER_EXTRA) $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA) cat $$($1_$2_SHELL_WRAPPER_NAME) >> $$@ @@ -71,6 +72,7 @@ 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)" |