Skip to content

Commit

Permalink
travis: export MACADDR, do not source get-xilinx
Browse files Browse the repository at this point in the history
jordens committed Jun 25, 2015
1 parent b820b7a commit 52030ab
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .travis/get-xilinx.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 52030ab

Please sign in to comment.