travis: export MACADDR, do not source get-xilinx

jordens · jordens · commit 52030ab1b74f · 2015-06-25T13:08:56.000-06:00
diff --git 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
@@ -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
