From c560a143786d24b0735c7182263319a29e7957ae Mon Sep 17 00:00:00 2001
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Mon, 30 Dec 2024 15:57:33 +0800
Subject: [PATCH] gnu: chibi-scheme: Fix cross-compilation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/scheme.scm (chibi-scheme)[arguments]: Use G-expression.
<#:make-flags>:When cross-compilation, Set CHIBI.
[native-inputs]: When cross-compilation. Add this-package.

Change-Id: I424854d77e575f2e2aab8a5a9d32ef628c9db953
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/scheme.scm | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index a8647a53ccea61e08832ee1abeb9edddc311b4b4..c6d36e0336155d797b431b95abda7fc6af2f13f0 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2024 Skylar Hill <stellarskylark@posteo.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -607,14 +608,24 @@ mixed.")
         (base32 "02zq35hdbi03rmmamx6ml4ihsigdl4mmbf6d9ysazv8ciiln5v4b"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure))           ; no configure script
-       #:make-flags (let ((out (assoc-ref %outputs "out")))
-                      (list (string-append "PREFIX=" out)
-                            (string-append "CC=" ,(cc-for-target))
-                            (string-append "LDFLAGS=-Wl,-rpath=" out "/lib")))
-       #:test-target "test"))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))           ; no configure script
+           #:make-flags
+           #~(list
+              #$@(if
+                  (%current-target-system)
+                  #~((string-append
+                      "CHIBI=" #+(this-package-native-input "chibi-scheme")
+                      "/bin/chibi-scheme"))
+                  #~())
+              (string-append "PREFIX=" #$output)
+              (string-append "CC=" #$(cc-for-target))
+              (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
+           #:test-target "test"))
+    (native-inputs (if (%current-target-system)
+                       (list this-package)
+                       (list)))
     (synopsis "Small embeddable Scheme implementation")
     (description
      "Chibi-Scheme is a very small library with no external dependencies