From cf74cd0f38d7079fae0659b4d8375d3d71ca0c03 Mon Sep 17 00:00:00 2001 From: Yann Sionneau Date: Fri, 14 Aug 2015 18:59:30 +0200 Subject: [PATCH] travis: dont overwrite conda env PATH, escape dollar signs, fixes #84 --- .travis/get-toolchain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/get-toolchain.sh b/.travis/get-toolchain.sh index fdf8195d1..9b0ca48cc 100755 --- a/.travis/get-toolchain.sh +++ b/.travis/get-toolchain.sh @@ -21,8 +21,8 @@ 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 -echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $HOME/.mlabs/build_settings.sh -echo "export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PATH" >> $HOME/.mlabs/build_settings.sh +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 or1k-linux-as --version llc --version