Skip to content

Commit

Permalink
travis: export llvm-or1k lib/ in LD_LIBRARY_PATH.
Browse files Browse the repository at this point in the history 
The llvm-or1k build that is currently used is dynamically linked,
and in case llvmlite-artiq is linked with this llvm-or1k,
this is necessary to run ARTIQ.
whitequark committed Oct 10, 2015
1 parent a05d04b commit 6d0ec2f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .travis/get-toolchain.sh
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,10 @@ do
done

export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH
export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$PWD/packages/usr/local/llvm-or1k/lib:$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:$LD_LIBRARY_PATH

echo "export LD_LIBRARY_PATH=$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:\$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh
echo "export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:\$PATH" >> $HOME/.mlabs/build_settings.sh
echo "export LD_LIBRARY_PATH=$PWD/packages/usr/local/llvm-or1k/lib:$PWD/packages/usr/lib/x86_64-linux-gnu:$PWD/packages/usr/local/x86_64-unknown-linux-gnu/or1k-elf/lib:\$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh

or1k-linux-as --version
llc --version
clang --version

0 comments on commit 6d0ec2f

Please sign in to comment.