From 2f4b0635135dd55591a79c289c08e93a91bbb8a7 Mon Sep 17 00:00:00 2001
From: Stephan Maka <sm@m-labs.hk>
Date: Wed, 23 Dec 2020 15:28:51 +0100
Subject: [PATCH] artiq-board: use new misoc top-level Makefile for software
 build

---
 artiq-full/artiq-board.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/artiq-full/artiq-board.nix b/artiq-full/artiq-board.nix
index 83b77ef..2f9f015 100644
--- a/artiq-full/artiq-board.nix
+++ b/artiq-full/artiq-board.nix
@@ -91,12 +91,7 @@ let
         export CARGO_HOME=${cargoVendored}
         export TARGET_AR=or1k-linux-ar
 
-        for PKG in software/{libunwind,libm,libprintf,ksupport,bootloader,runtime,satman} ; do
-            [ -e $PKG/Makefile ] && make -C $PKG BUILDINC_DIRECTORY=`pwd`/software/include
-        done
-        echo Ok
-        # TODO: https://github.com/m-labs/misoc/pull/104
-        # make -C software BUILDINC_DIRECTORY=`pwd`/software/include
+        make BUILDINC_DIRECTORY=`pwd`/include
         '';
       installPhase =
         ''