17/18: squash! binutils in base.scm

[guix-commits]

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

commit 7ec24fc166d5eee3f5ed348b57d7af4363dfe038
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Mar 9 21:07:00 2021 +0200

    squash! binutils in base.scm
    
    * gnu/packages/commencement.scm (binutils-boot0)[arguments]: Move custom
    phases after inherited arguments.
---
 gnu/packages/commencement.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 219e0f2..13f3307 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2650,6 +2650,14 @@ exec " gcc "/bin/" program
        #:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (ice-9 ftw))                    ; for 'scandir'
+
+       ;; #:phases gets modified for powerpc-linux in binutils,
+       ;; so #:phases here needs to be after the inherited one.
+       ,@(substitute-keyword-arguments (package-arguments binutils)
+           ((#:configure-flags cf)
+            `(cons ,(string-append "--target=" (boot-triplet))
+                   ,cf)))
+
        #:phases (modify-phases %standard-phases
                   ,@(if (string=? (%current-system) "powerpc-linux")
                       '((add-after 'unpack 'disable-rust-libiberty-test
@@ -2671,12 +2679,8 @@ exec " gcc "/bin/" program
                         (with-directory-excursion (string-append out "/bin")
                           (for-each (lambda (name)
                                       (symlink name (remove-triplet-prefix 
name)))
-                                    (scandir "." has-triplet-prefix?)))))))
+                                    (scandir "." has-triplet-prefix?)))))))))
 
-       ,@(substitute-keyword-arguments (package-arguments binutils)
-           ((#:configure-flags cf)
-            `(cons ,(string-append "--target=" (boot-triplet))
-                   ,cf)))))
     (inputs (%boot0-inputs))))
 
 (define libstdc++-boot0