Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fixed installing clang for mason builds

Browse Source
This commit is contained in:
Patrick Niklaus 2016-11-19 12:15:10 +00:00 committed by Patrick Niklaus
parent 8c941d1344
commit 4ccb08983f
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -56,7 +56,7 @@ matrix:
# TODO: xcode8 triggers undefined symbol 'clock_gettime' in boost::interprocess # TODO: xcode8 triggers undefined symbol 'clock_gettime' in boost::interprocess
osx_image: xcode7.3 osx_image: xcode7.3
compiler: clang compiler: clang
env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON env: CLANG_VERSION='3.8.1' ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON
# Release Builds # Release Builds
- os: linux - os: linux
@ -65,7 +65,7 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['libstdc++-5-dev'] packages: ['libstdc++-5-dev']
env: BUILD_TYPE='Release' ENABLE_MASON=ON env: CLANG_VERSION='3.8.1' BUILD_TYPE='Release' ENABLE_MASON=ON
- os: linux - os: linux
compiler: "gcc-6-release" compiler: "gcc-6-release"
@ -156,13 +156,6 @@ install:
sudo ldconfig sudo ldconfig
fi fi
- popd - popd
- |
if [[ ${ENABLE_MASON:-OFF} == 'ON' ]]; then
# for mason builds we need to point the example
# at the clang++ installed by the CMakeLists.txt automatically
export CXX=$(./third_party/mason/mason prefix clang++ 3.8.1)/bin/clang++
export CC=$(./third_party/mason/mason prefix clang++ 3.8.1)/bin/clang
fi
- mkdir example/build && pushd example/build - mkdir example/build && pushd example/build
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
- make - make