diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-02-17 08:36:56 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-02-17 09:06:11 -0600 |
| commit | 555eef1d0fb5a7fd07971c1201b3c520f01125d4 (patch) | |
| tree | da0cb249cbb06d41b0111b82aad642efd5365eb0 /aclocal.m4 | |
| parent | 49d99ebf6e341e26caf1d3db794cb6fa06ee72f6 (diff) | |
| download | haskell-555eef1d0fb5a7fd07971c1201b3c520f01125d4.tar.gz | |
Remove RAWCPP_FLAGS (Task #9094)
Reviewers: carter, austin
Reviewed By: austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D648
GHC Trac Issues: #9094
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 6933e6f647..cb4aa83ec3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2146,7 +2146,7 @@ dnl ** what cpp to use? dnl -------------------------------------------------------------- AC_ARG_WITH(hs-cpp, [AC_HELP_STRING([--with-hs-cpp=ARG], - [Use ARG as the path to cpp [default=autodetect]])], + [Path to the (C) preprocessor for Haskell files [default=autodetect]])], [ if test "$HostOS" = "mingw32" then @@ -2157,6 +2157,8 @@ AC_ARG_WITH(hs-cpp, ], [ + # We can't use $CPP here, since HS_CPP_CMD is expected to be a single + # command (no flags), and AC_PROG_CPP defines CPP as "/usr/bin/gcc -E". HS_CPP_CMD=$WhatGccIsCalled SOLARIS_GCC_CPP_BROKEN=NO @@ -2198,7 +2200,7 @@ dnl ** what cpp flags to use? dnl ----------------------------------------------------------- AC_ARG_WITH(hs-cpp-flags, [AC_HELP_STRING([--with-hs-cpp-flags=ARG], - [Use ARG as the path to hs cpp [default=autodetect]])], + [Flags to the (C) preprocessor for Haskell files [default=autodetect]])], [ if test "$HostOS" = "mingw32" then @@ -2210,11 +2212,11 @@ AC_ARG_WITH(hs-cpp-flags, [ $HS_CPP_CMD -x c /dev/null -dM -E > conftest.txt 2>&1 if grep "__clang__" conftest.txt >/dev/null 2>&1; then - HS_CPP_ARGS="-E -undef -traditional -Wno-invalid-pp-token -Wno-unicode -Wno-trigraphs " + HS_CPP_ARGS="-E -undef -traditional -Wno-invalid-pp-token -Wno-unicode -Wno-trigraphs" else $HS_CPP_CMD -v > conftest.txt 2>&1 if grep "gcc" conftest.txt >/dev/null 2>&1; then - HS_CPP_ARGS="-E -undef -traditional " + HS_CPP_ARGS="-E -undef -traditional" else $HS_CPP_CMD --version > conftest.txt 2>&1 if grep "cpphs" conftest.txt >/dev/null 2>&1; then |