diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ab16660..6dd4d55 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -139,6 +139,19 @@ (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f + + #:phases (alist-cons-after + 'install 'add-gas-symlink + (lambda* (#:key outputs #:allow-other-keys) + ;; The cross-gcc invokes 'as', not the cross-'as', so add + ;; an 'as' symlink. + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/bin") + (symlink (string-append ,(boot-triplet) "-as") + "as") + #t))) + %standard-phases) + ,@(substitute-keyword-arguments (package-arguments binutils) ((#:configure-flags cf) `(cons ,(string-append "--target=" (boot-triplet)) @@ -274,10 +287,7 @@ ;; 2nd stage inputs. `(("gcc" ,gcc-boot0) ("binutils-cross" ,binutils-boot0) - - ;; Keep "binutils" here because the cross-gcc invokes `as', not the - ;; cross-`as'. - ,@%boot0-inputs)) + ,@(alist-delete "binutils" %boot0-inputs))) (define glibc-final-with-bootstrap-bash ;; The final libc, "cross-built". If everything went well, the resulting