From 0e8b70205a03fbdee4e5228169a9ed287cbd158b Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 26 Jun 2016 12:56:30 -0500 Subject: [PATCH] Use llvm dir to find correct libc++ --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0a9cba..1f11f02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,10 +156,10 @@ install: # Use libc++ - | if [[ "$LIBCXX" == "on" ]]; then - export LDFLAGS="-L${DEPS_DIR}/usr/lib -lc++ -lc++abi" - export CFLAGS="${CFLAGS} -stdlib=libc++ -nostdinc++ -isystem ${DEPS_DIR}/usr/include/c++/v1" - export CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -nostdinc++ -isystem ${DEPS_DIR}/usr/include/c++/v1" - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DEPS_DIR}/usr/lib" + export LDFLAGS="-L${LLVM_DIR}/usr/lib -lc++ -lc++abi" + export CFLAGS="${CFLAGS} -stdlib=libc++ -nostdinc++ -isystem ${LLVM_DIR}/usr/include/c++/v1" + export CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -nostdinc++ -isystem ${LLVM_DIR}/usr/include/c++/v1" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LLVM_DIR}/usr/lib" fi # Show files that have been installed - ls -lR ${DEPS_DIR}/usr