branch core-updates-frozen updated: gnu: fpc: Fix it, really.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new 7b15e14  gnu: fpc: Fix it, really.
7b15e14 is described below

commit 7b15e14a904c732d7c950b8a624904308d5b869f
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Nov 12 17:38:17 2021 -0500

    gnu: fpc: Fix it, really.
    
    * gnu/packages/pascal.scm (fpc): Inputs are controlled to be package-like
    objects, so the previous attempt also failed.
    [native-inputs]{fpc-binary}: Backtrack to the original solution, which is to
    use the x86_64 bootstrap input for unsupported architectures.
---
 gnu/packages/pascal.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm
index 74daf05..e199f98 100644
--- a/gnu/packages/pascal.scm
+++ b/gnu/packages/pascal.scm
@@ -93,14 +93,15 @@
        ("zlib" ,zlib)))
     (native-inputs
      ;; FPC is built with FPC, so we need bootstrap binaries.
-     `(("fpc-binary"
-        (match ,(or (%current-target-system)
-                    (%current-system))
-          ("i686-linux" ,fpc-bootstrap-i386)
-          ;;("powerpc64le-linux" ,fpc-bootstrap-ppc64le)
-          ;;("powerpc-linux" ,fpc-bootstrap-ppc)
-          ("x86_64-linux" ,fpc-bootstrap-x86_64)
-          (arch (error "fpc arch not yet supported in guix" arch))))))
+     `(("fpc-binary" ,(match (or (%current-target-system)
+                                 (%current-system))
+                       ("i686-linux" fpc-bootstrap-i386)
+                       ;;("powerpc64le-linux" fpc-bootstrap-ppc64le)
+                       ;;("powerpc-linux" fpc-bootstrap-ppc)
+                       ("x86_64-linux" fpc-bootstrap-x86_64)
+                       ;; XXX: Wrong, but innocuous so long
+                       ;; `supported-systems' is kept in sync.
+                       (_ fpc-bootstrap-x86_64)))))
     (arguments
      `(#:tests? #f ; no tests available
        #:phases