Skip to content

Commit

Permalink
travis: dont overwrite conda env PATH, escape dollar signs, fixes #84
Browse files Browse the repository at this point in the history
@fallen
fallen committed Aug 14, 2015
1 parent e6f3285 commit cf74cd0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .travis/get-toolchain.sh
View file
Original file line number Diff line number Diff line change
@@ -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

3 comments on commit cf74cd0

@jordens
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is build_settings.sh needed at all? The environment is inherited.

@fallen
Copy link
Contributor Author

@fallen fallen commented on cf74cd0 Aug 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm I thought the environment was cleared when doing a conda build.
Maybe I got it wrong, I will recheck that.

@jordens
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. It does clean up the environment. But AFAICT PATH will be inherited. LD_LIBRARY_PATH should probably be handled as http://conda.pydata.org/docs/building/environment-vars.html#inherited-env-vars instead of build_settings.sh.

Please sign in to comment.