pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ci): Update libc++ install script

Browse Source
This commit is contained in:
Michael Carlberg 2016-12-15 21:32:05 +01:00
parent b692fb4a54
commit 1d53e7f454
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/travis/environment.sh
View File

@ -10,7 +10,10 @@ if [ "${CXX:0:7}" = "clang++" ]; then
export CXX="clang++-3.8"
export CC="clang-3.8"
export CXXFLAGS="${CXXFLAGS} -Qunused-arguments"
elif [ "${CXX}" = "g++" ]; then
elif [ "${CXX:0:3}" = "g++" ]; then
export CXX="g++-5"
export CC="gcc-5"
elif [ "${CXX:0:3}" = "gcc" ]; then
export CXX="g++-5"
export CC="gcc-5"
fi

8
common/travis/install_libcpp.sh
View File

@ -7,16 +7,12 @@ if [ "${CXX:0:7}" = "clang++" ]; then
travis_retry wget --quiet -O - "${LIBCXX_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}/projects/libcxx"
travis_retry wget --quiet -O - "${LIBCXXABI_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}/projects/libcxxabi"
(cd "${LLVM_ROOT}/build" && cmake .. -DCMAKE_CXX_COMPILER=clang++ && make cxxabi cxx -j2)
(cd "${LLVM_ROOT}/build" && cmake .. -DCMAKE_CXX_COMPILER="$CXX" -DCMAKE_C_COMPILER="$CC" -DCMAKE_INSTALL_PREFIX="${LLVM_ROOT}/install" -DCMAKE_BUILD_TYPE=$BUILD_TYPE)
(cd "${LLVM_ROOT}/build/projects/libcxx" && make install)
(cd "${LLVM_ROOT}/build/projects/libcxxabi" && make install)
fi
export CXXFLAGS="${CXXFLAGS} -I${LLVM_ROOT}/install/include"
export CXXFLAGS="${CXXFLAGS} -I ${LLVM_ROOT}/install/include/c++/v1"
export CXXFLAGS="${CXXFLAGS} -stdlib=libc++"
export LDFLAGS="${LDFLAGS} -L${LLVM_ROOT}/install/lib"
export LDFLAGS="${LDFLAGS} -lc++"
export LDFLAGS="${LDFLAGS} -lc++abi"
export LDFLAGS="${LDFLAGS} -L ${LLVM_ROOT}/install/lib -lc++ -lc++abi"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LLVM_ROOT}/install/lib"
fi