diff options
| author | John Ericson <git@JohnEricson.me> | 2019-09-03 21:10:59 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-09-05 18:50:56 -0400 |
| commit | b55ee979d32df938eee9c4c02c189f8be267e8a1 (patch) | |
| tree | c1d1006c0ddd76f85c05a9258d687a32d2f6ce96 /aclocal.m4 | |
| parent | f96d57b800f10ab194897133f3c0d11e4fbc71b4 (diff) | |
| download | haskell-b55ee979d32df938eee9c4c02c189f8be267e8a1.tar.gz | |
Make sure all boolean settings entries use `YES` / `NO`
Some where using `True` / `False`, a legacy of when they were in
`Config.hs`. See #16914 / d238d3062a9858 for a similar problem.
Also clean up the configure variables names for consistency and clarity
while we're at it. "Target" makes clear we are talking about outputted
code, not where GHC itself runs.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index dd5efdf61a..4729a1ca16 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -315,11 +315,11 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], AC_LINK_IFELSE( [AC_LANG_PROGRAM([], [__asm__ (".subsections_via_symbols");])], [AC_MSG_RESULT(yes) - HaskellHaveSubsectionsViaSymbols=True + TargetHasSubsectionsViaSymbols=YES AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[1], [Define to 1 if Apple-style dead-stripping is supported.]) ], - [HaskellHaveSubsectionsViaSymbols=False + [TargetHasSubsectionsViaSymbols=NO AC_MSG_RESULT(no)]) dnl ** check for .ident assembler directive @@ -329,9 +329,9 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], AC_LINK_IFELSE( [AC_LANG_PROGRAM([__asm__ (".ident \"GHC x.y.z\"");], [])], [AC_MSG_RESULT(yes) - HaskellHaveIdentDirective=True], + TargetHasIdentDirective=YES], [AC_MSG_RESULT(no) - HaskellHaveIdentDirective=False]) + TargetHasIdentDirective=NO]) dnl *** check for GNU non-executable stack note support (ELF only) dnl (.section .note.GNU-stack,"",@progbits) @@ -361,9 +361,9 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], __asm__ (".section .text"); ], [0])], [AC_MSG_RESULT(yes) - HaskellHaveGnuNonexecStack=True], + TargetHasGnuNonexecStack=YES], [AC_MSG_RESULT(no) - HaskellHaveGnuNonexecStack=False]) + TargetHasGnuNonexecStack=NO]) CFLAGS="$CFLAGS2" checkArch "$BuildArch" "HaskellBuildArch" @@ -380,9 +380,9 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], AC_SUBST(HaskellTargetArch) AC_SUBST(HaskellTargetOs) - AC_SUBST(HaskellHaveSubsectionsViaSymbols) - AC_SUBST(HaskellHaveIdentDirective) - AC_SUBST(HaskellHaveGnuNonexecStack) + AC_SUBST(TargetHasSubsectionsViaSymbols) + AC_SUBST(TargetHasIdentDirective) + AC_SUBST(TargetHasGnuNonexecStack) ]) |