Skip to content

Commit

Permalink
scripts: Prevent conda-pack activation from setting excessive env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
PiotrZierhoffer committed Nov 1, 2019
1 parent 08b7bdc commit 389d195
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions scripts/enter-pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ echo "----------------------"
source $ENV_PATH/bin/activate
conda-unpack

# Some packages we use (like openocd or iceprog) rely on host GCC and binutils
# being installed. This in turn installs activation scripts, as conda assumes
# these compilers will be used in the environment.
# These scripts set plethora of GCC-related env variables, messing up our
# cross-compilers. That's why we need to source the deactivation scripts.
source $ENV_PATH/etc/conda/deactivate.d/deactivate-binutils_linux-64.sh
source $ENV_PATH/etc/conda/deactivate.d/deactivate-gcc_linux-64.sh

# This is required as conda-pack does not contain editable modules.
# This operation is idempotent though, so we don't need additional checks.
echo ""
Expand Down

0 comments on commit 389d195

Please sign in to comment.