guix-commits
[Top][All Lists]
Advanced

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

16/18: squash! binutils in base.scm


From: guix-commits
Subject: 16/18: squash! binutils in base.scm
Date: Fri, 12 Mar 2021 03:22:42 -0500 (EST)

efraim pushed a commit to branch wip-ppc
in repository guix.

commit ab12b477e65a1a28ccaf50af065e4db802ba22b7
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Mar 9 21:01:28 2021 +0200

    squash! binutils in base.scm
    
    this approach is probably better, and it doesn't affect the output of
    'guix build -d hello --system=i686-linux'
---
 gnu/packages/base.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 2de12b3..5b846f6 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -532,15 +532,15 @@ change.  GNU make offers many powerful extensions over 
the standard utility.")
                           ;; Make sure 'ar' and 'ranlib' produce archives in a
                           ;; deterministic fashion.
                           "--enable-deterministic-archives")
-      #:phases
-      (modify-phases %standard-phases
-        ,@(if (string=? (%current-system) "powerpc-linux")
-            '((add-after 'unpack 'disable-rust-libiberty-test
+      ,@(if (string=? (%current-system) "powerpc-linux")
+          `(#:phases
+            (modify-phases %standard-phases
+              (add-after 'unpack 'disable-rust-libiberty-test
                 (lambda _
                   (substitute* "libiberty/testsuite/Makefile.in"
                     ((" check-rust-demangle ") ""))
-                  #t)))
-            '()))))
+                  #t))))
+          '())))
 
    (synopsis "Binary utilities: bfd gas gprof ld")
    (description



reply via email to

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