From afc4945d44aeb6750b980abddbfda66f6ccb6b18 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 30 Nov 2021 12:14:27 +0100 Subject: gnu: ghc: Fix build on i686-linux. * gnu/packages/haskell.scm (ghc-8.10)[arguments]<#:phases>: Disable failing test. Signed-off-by: Lars-Dominik Braun --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 69a806e635..d3db023f08 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -711,12 +712,18 @@ interactive environment for the functional language Haskell.") (("\\]\\), " all) (string-append all "expect_broken(0)], "))))) ;; TODO: Turn this into an undconditional patch on the next rebuild. - ,@(if (string=? "i686-linux" (%current-system)) + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) '((add-after 'skip-more-tests 'skip-failing-tests-i686 (lambda _ (substitute* '("testsuite/tests/codeGen/should_compile/all.T") (("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before) - (string-append before "when(arch('i386'), skip)")))))) + (string-append before "when(arch('i386'), skip)"))) + ;; Unexpected failures: + ;; quasiquotation/T14028.run T14028 [bad stderr] (dyn) + (substitute* '("testsuite/tests/quasiquotation/all.T") + (("unless\\(config.have_ext_interp, skip\\),") + "unless(config.have_ext_interp, skip), when(arch('i386'), skip),"))))) '()))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") -- cgit v1.2.3