diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-27 11:14:56 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-10-27 11:16:03 -0400 |
| commit | c7b70eca545e6a46512745124487077f6a542d9e (patch) | |
| tree | 5e47ddef0b5de141562b53dbbfe97070cf996f4b | |
| parent | acedfc8b8706a92127c96f487e3e3b1636451704 (diff) | |
| download | haskell-c7b70eca545e6a46512745124487077f6a542d9e.tar.gz | |
Don't substitute GccVersion variablewip/kill-gccversion
Not only is it now unused but we generally can't assume that we are
compiling with GCC, so it really shouldn't be used.
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index aea0d64886..f5e7050a69 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1315,7 +1315,7 @@ AC_DEFUN([FP_PROG_AR_NEEDS_RANLIB],[ # FP_GCC_VERSION # ----------- # Extra testing of the result AC_PROG_CC, testing the gcc version no. Sets the -# output variable GccVersion. +# (unsubstituted) output variable GccVersion. AC_DEFUN([FP_GCC_VERSION], [ AC_REQUIRE([AC_PROG_CC]) if test -z "$CC" @@ -1330,7 +1330,7 @@ AC_DEFUN([FP_GCC_VERSION], [ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [4.6], [AC_MSG_ERROR([Need at least gcc version 4.6 (4.7+ recommended)])]) ]) - AC_SUBST([GccVersion], [$fp_cv_gcc_version]) + GccVersion="$fp_cv_gcc_version" ])# FP_GCC_VERSION dnl Check to see if the C compiler is clang or llvm-gcc diff --git a/mk/config.mk.in b/mk/config.mk.in index cd85c65189..98155f823e 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -521,8 +521,6 @@ SettingsOptCommand = @SettingsOptCommand@ # the flag CC=<blah> instead. The reason is that the configure script # needs to know which gcc you're using in order to perform its tests. -GccVersion = @GccVersion@ - # TargetPlatformFull retains the string passed to configure so we have it in # the necessary format to pass to libffi's configure. TargetPlatformFull = @TargetPlatformFull@ |