guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

127/127: gnu: librsvg: Improve cross compiling.


From: guix-commits
Subject: 127/127: gnu: librsvg: Improve cross compiling.
Date: Tue, 26 Dec 2023 06:43:01 -0500 (EST)

efraim pushed a commit to branch rust-team
in repository guix.

commit eee92c9ad97f426516d119bb8ce27b11ed645f79
Author: Zheng Junjie <873216071@qq.com>
AuthorDate: Tue Dec 26 13:17:15 2023 +0200

    gnu: librsvg: Improve cross compiling.
    
    * gnu/packages/gnome.scm (librsvg)[arguments]: Use platform-rust-target.
    
    Change-Id: Ia81e13a8695f7b932255e5223b92d31fb0a88077
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/gnome.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b0417b2df9..ae92ae4266 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -238,6 +238,7 @@
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix platform)
   #:use-module (guix utils)
   #:use-module (guix gexp)
   #:use-module (ice-9 match)
@@ -3593,12 +3594,12 @@ for dealing with different structured file formats.")
               ;; In lieu of #:make-flags
               (setenv "CC" #$(cc-for-target))
               (setenv "PKG_CONFIG" #$(pkg-config-for-target))
-              (when #$(%current-target-system)
-                (setenv "RUST_TARGET"
-                        (string-replace
-                          #$(%current-target-system)
-                          "-unknown-linux-gnu"
-                          (string-index #$(%current-target-system) #\-))))
+              #$@(if (%current-target-system)
+                     #~((setenv "RUST_TARGET"
+                                #$(platform-rust-target
+                                    (lookup-platform-by-target
+                                      (%current-target-system)))))
+                     #~())
               ;; Something about the build environment resists building
               ;; successfully with the '--locked' flag.
               (substitute* '("Makefile.am" "Makefile.in")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]