From 2aeeaf881219222bbbb50a242842bb7a91b91250 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Tue, 3 May 2022 13:39:47 +0530
Subject: gn: cva6: Set #:make-flags instead of overriding the build phase.

* gn/packages/riscv.scm (cva6)[arguments]: Set #:make-flags instead of
overriding the build phase.
---
 gn/packages/riscv.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gn/packages/riscv.scm b/gn/packages/riscv.scm
index 8c7c76a..ae4a72e 100644
--- a/gn/packages/riscv.scm
+++ b/gn/packages/riscv.scm
@@ -58,6 +58,9 @@
      (arguments
       (list
        #:tests? #f
+       #:make-flags #~(list "verilate"
+                            ;; Dummy RISCV to suppress Makefile error.
+                            "RISCV=foo")
        #:phases
        #~(modify-phases %standard-phases
            ;; Patch cva6 to print to stdout correctly. See
@@ -68,12 +71,6 @@
                  (("rvfi_i\\[i\\].insn == 32'h00000073")
                   "0"))))
            (delete 'configure)
-           (replace 'build
-             (lambda _
-               (invoke "make" "verilate"
-                       (string-append "-j" (number->string (parallel-job-count)))
-                       ;; Set dummy RISCV to suppress Makefile error.
-                       "RISCV=foo")))
            (replace 'install
              (lambda* (#:key outputs #:allow-other-keys)
                (let ((bin (string-append (assoc-ref outputs "out")
-- 
cgit v1.2.3