diff options
| author | Stefan Schulze Frielinghaus <stefansf@linux.ibm.com> | 2020-07-23 11:04:23 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-07-28 12:58:12 -0400 |
| commit | 2e4fe92067da5e395daf0822113b3d38293db407 (patch) | |
| tree | 5d0ad32f23853d06bee41fffd62fa94412be8547 | |
| parent | 6471cc6aff80d5deebbdb1bf7b677b31ed2af3d5 (diff) | |
| download | haskell-2e4fe92067da5e395daf0822113b3d38293db407.tar.gz | |
Require SMP support in order to build a threaded stage1
Fixes #18266
(cherry picked from commit fc0f6fbcd95f2dc69a8efabbee2d8a485c34cc47)
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c835bc7e7b..ba48c9da4e 100644 --- a/configure.ac +++ b/configure.ac @@ -147,13 +147,17 @@ if test "$WithGhc" != ""; then BOOTSTRAPPING_GHC_INFO_FIELD([AR_STAGE0],[ar command]) BOOTSTRAPPING_GHC_INFO_FIELD([AR_OPTS_STAGE0],[ar flags]) BOOTSTRAPPING_GHC_INFO_FIELD([ArSupportsAtFile_STAGE0],[ar supports at file]) + BOOTSTRAPPING_GHC_INFO_FIELD([SUPPORT_SMP_STAGE0],[Support SMP]) BOOTSTRAPPING_GHC_INFO_FIELD([RTS_WAYS_STAGE0],[RTS ways]) dnl Check whether or not the bootstrapping GHC has a threaded RTS. This dnl determines whether or not we can have a threaded stage 1. dnl See Note [Linking ghc-bin against threaded stage0 RTS] in dnl hadrian/src/Settings/Packages.hs for details. - if echo ${RTS_WAYS_STAGE0} | grep '.*thr.*' 2>&1 >/dev/null; then + dnl SMP support which implies a registerised stage0 is also required (see issue 18266) + if echo ${RTS_WAYS_STAGE0} | grep '.*thr.*' 2>&1 >/dev/null && \ + test "$SUPPORT_SMP_STAGE0" = "YES" + then AC_SUBST(GhcThreadedRts, YES) else AC_SUBST(GhcThreadedRts, NO) |