From 015189b2ae67278ad08e8ac2ea55a53729e1ff6a Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Mon, 26 Feb 2018 16:25:49 +0000
Subject: [PATCH] conda: modernize build.sh.

---
 conda/artiq-board/build.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/conda/artiq-board/build.sh b/conda/artiq-board/build.sh
index 3df4c52e5..9a4975cd9 100644
--- a/conda/artiq-board/build.sh
+++ b/conda/artiq-board/build.sh
@@ -1,14 +1,11 @@
 #!/bin/bash
 
-BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
-[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
-
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-${ARTIQ_VARIANT}
-mkdir -p $SOC_PREFIX
+SOC_PREFIX=$SP_DIR/artiq/binaries/${ARTIQ_TARGET}-${ARTIQ_VARIANT}
+mkdir -p ${SOC_PREFIX}
 
 V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H ${ARTIQ_VARIANT} --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
-cp misoc_${ARTIQ_VARIANT}_kc705/gateware/top.bit $SOC_PREFIX
-cp misoc_${ARTIQ_VARIANT}_kc705/software/bios/bios.bin $SOC_PREFIX
-cp misoc_${ARTIQ_VARIANT}_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
+cp -v misoc_${ARTIQ_VARIANT}_kc705/gateware/top.bit $SOC_PREFIX
+cp -v misoc_${ARTIQ_VARIANT}_kc705/software/bios/bios.bin $SOC_PREFIX
+cp -v misoc_${ARTIQ_VARIANT}_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
 
 wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit