Skip to content

Commit fd0b674

Browse files
committed
On Linux compile tests with unset LD_LIBRARY_PATH.
1 parent eb43b40 commit fd0b674

2 files changed

Lines changed: 0 additions & 9 deletions

File tree

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ install:
108108
export MACOSX_DEPLOYMENT_TARGET=10.7;
109109
fi
110110

111-
# Linux ld linker requires that libraries can be resolved at link time.
112-
- if ${MYUSEMC} && [[ "${TRAVIS_OS_NAME}" == linux ]]; then
113-
export LD_LIBRARY_PATH="${MYLIB}";
114-
fi
115-
116111
- scons build=debug prefix="${MYPREFIX}" test_installed=true alltests
117112
- scons build=fast prefix="${MYPREFIX}" test_installed=true alltests
118113
- MYALLTESTSFAST=$(ls -t ${PWD}/build/fast*/tests/alltests | head -1)

conda-recipe/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
export CPATH="${PREFIX}/include:${CPATH}"
44
export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
55

6-
if [[ `uname` == Linux ]]; then
7-
export LD_LIBRARY_PATH="${PREFIX}/lib"
8-
fi
9-
106
MYNCPU=$(( (CPU_COUNT > 8) ? 8 : CPU_COUNT ))
117

128
# Apply sconscript.local customizations.

0 commit comments

Comments
 (0)