diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-27 03:01:37 +0000 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-02 01:37:08 -0400 |
commit | 37a37139160f628a0ce3b27d8269fcf86d226f71 (patch) | |
tree | 1a82616b41c105cb8dfe4ece11f8fb9caf0b77d3 /m4 | |
parent | f1a782dd29480c4570465ea0aa06008bbf444e13 (diff) | |
download | haskell-37a37139160f628a0ce3b27d8269fcf86d226f71.tar.gz |
Separate some AC_SUBST / AC_DEFINE
Eventually, the RTS configure alone will need the vast majority of
AC_DEFINE, and the top-level configure will need the most AC_SUBST. By
removing the "side effects" of the macros like this we make them more
reusable so they can be shared between the two configures without doing
too much.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/fp_cc_llvm_backend.m4 | 2 | ||||
-rw-r--r-- | m4/fp_leading_underscore.m4 | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/m4/fp_cc_llvm_backend.m4 b/m4/fp_cc_llvm_backend.m4 index 75cdf759bf..521c5b8cba 100644 --- a/m4/fp_cc_llvm_backend.m4 +++ b/m4/fp_cc_llvm_backend.m4 @@ -5,14 +5,12 @@ AC_DEFUN([FP_CC_LLVM_BACKEND], AC_MSG_CHECKING([whether C compiler has an LLVM back end]) $CC -x c /dev/null -dM -E > conftest.txt 2>&1 if grep "__llvm__" conftest.txt >/dev/null 2>&1; then - AC_DEFINE([CC_LLVM_BACKEND], [1], [Define (to 1) if C compiler has an LLVM back end]) CcLlvmBackend=YES AC_MSG_RESULT([yes]) else CcLlvmBackend=NO AC_MSG_RESULT([no]) fi - AC_SUBST(CcLlvmBackend) rm -f conftest.txt ]) diff --git a/m4/fp_leading_underscore.m4 b/m4/fp_leading_underscore.m4 index 5fac9f9624..fde57c7625 100644 --- a/m4/fp_leading_underscore.m4 +++ b/m4/fp_leading_underscore.m4 @@ -46,11 +46,4 @@ char **argv; }]])],[fptools_cv_leading_underscore=yes],[fptools_cv_leading_underscore=no],[fptools_cv_leading_underscore=no]) ;; esac]); -AC_SUBST([LeadingUnderscore], [`echo $fptools_cv_leading_underscore | sed 'y/yesno/YESNO/'`]) -if test x"$fptools_cv_leading_underscore" = xyes; then - AC_SUBST([CabalLeadingUnderscore],[True]) - AC_DEFINE([LEADING_UNDERSCORE], [1], [Define to 1 if C symbols have a leading underscore added by the compiler.]) -else - AC_SUBST([CabalLeadingUnderscore],[False]) -fi ])# FP_LEADING_UNDERSCORE |