diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2017-11-15 11:38:04 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-11-15 11:38:07 -0500 |
| commit | 5dea62fbbc5b8fa19503a814c3915331e54ac899 (patch) | |
| tree | 550efe6f45784b8d70c02ccfbdb004f699903cc2 /aclocal.m4 | |
| parent | 6dfe9828e2b3bd79e22e89c919b0d1b92273b718 (diff) | |
| download | haskell-5dea62fbbc5b8fa19503a814c3915331e54ac899.tar.gz | |
Adds rts/rts.cabal.in file
This is in preparation for cabalification of the `rts`. To be actually
able to parse this file, a rather recent Cabal is required. One after
commit 357d49d of haskell/cabal. The relevant PR to support the new
`asm-sources` and `cmm-sources` is haskell/cabal/pull/4857.
Not that this does *not* allow cabal to build the RTS. It does however
provide enough information such that cabal can `copy` and `register`
the package properly in the package database, if all the build
artifacts have been build properly.
As such it does not require any custom handling of the `rts` package.
As the rts as well as all the other packages built by the GHC built
system are built outside of cabal anyway.
Reviewers: bgamari, hvr, erikd, simonmar
Reviewed By: bgamari
Subscribers: rwbarton, thomie, erikd
Differential Revision: https://phabricator.haskell.org/D4174
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index c5fdd1e53a..c77c8de4cc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -858,8 +858,12 @@ char **argv; 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.]) -fi])# FP_LEADING_UNDERSCORE +else + AC_SUBST([CabalLeadingUnderscore],[False]) +fi +])# FP_LEADING_UNDERSCORE # FP_COMPARE_VERSIONS(VERSION1, TEST, VERSION2, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) @@ -2239,6 +2243,7 @@ $2=$HS_CPP_ARGS # ---------------------- # whether to use libbfd for debugging RTS AC_DEFUN([FP_BFD_SUPPORT], [ + AC_SUBST([CabalHaveLibbfd], [False]) AC_ARG_ENABLE(bfd-debug, [AC_HELP_STRING([--enable-bfd-debug], [Enable symbol resolution for -debug rts ('+RTS -Di') via binutils' libbfd [default=no]])], @@ -2276,7 +2281,7 @@ AC_DEFUN([FP_BFD_SUPPORT], [ bfd_get_symbol_info(abfd,symbol_table[0],&info); } ], - [],dnl bfd seems to work + [AC_SUBST([CabalHaveLibbfd], [True])],dnl bfd seems to work [AC_MSG_ERROR([can't use 'bfd' library])]) LIBS="$save_LIBS" ] |