From 52030ab1b74f2d2e541772f13055f53c3bca9c93 Mon Sep 17 00:00:00 2001
From: Robert Jordens <jordens@gmail.com>
Date: Thu, 25 Jun 2015 13:08:56 -0600
Subject: [PATCH] travis: export MACADDR, do not source get-xilinx

---
 .travis.yml           | 2 +-
 .travis/get-xilinx.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f89e4da82..1bee784bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
 before_install:
   - mkdir -p $HOME/.mlabs
   - if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi
-  - if [ $BUILD_SOC -ne 0 ]; then . ./.travis/get-xilinx.sh; fi
+  - if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi
   - . ./.travis/get-toolchain.sh
   - . ./.travis/get-anaconda.sh
   - source $HOME/miniconda/bin/activate py34
diff --git a/.travis/get-xilinx.sh b/.travis/get-xilinx.sh
index 88a2f1e6d..95d50e41c 100755
--- a/.travis/get-xilinx.sh
+++ b/.travis/get-xilinx.sh
@@ -31,6 +31,6 @@ make -C impersonate_macaddress
 cat > $HOME/.mlabs/build_settings.sh << EOF
 MISOC_EXTRA_VIVADO_CMDLINE="-Ob vivado_path $HOME/Xilinx/Vivado"
 MISOC_EXTRA_ISE_CMDLINE="-Ob ise_path $HOME/opt/Xilinx/"
-MACADDR=$macaddress
+export MACADDR=$macaddress
 export LD_PRELOAD=$PWD/impersonate_macaddress/impersonate_macaddress.so
 EOF