Install clang-3.8 via mason binary
This commit is contained in:
		
							parent
							
								
									6ecc123d15
								
							
						
					
					
						commit
						dfafe7dc5f
					
				
							
								
								
									
										24
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								.travis.yml
									
									
									
									
									
								
							| @ -49,16 +49,13 @@ matrix: | |||||||
|           packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] |           packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] | ||||||
|       env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Debug' |       env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Debug' | ||||||
| 
 | 
 | ||||||
|   # LLVM APT servers switched off, commenting Clang builds out as they will always fail now |     - os: linux | ||||||
|   # http://lists.llvm.org/pipermail/llvm-foundation/2016-June/000025.html |       compiler: "clang-3.8-debug" | ||||||
|   # |       addons: &clang38 | ||||||
|   #    - os: linux |         apt: | ||||||
|   #      compiler: "clang-3.8-debug" |           sources: ['ubuntu-toolchain-r-test'] | ||||||
|   #      addons: &clang38 |           packages: ['libstdc++-5-dev', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] | ||||||
|   #        apt: |       env: CLANG_VERSION='3.8.0' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON | ||||||
|   #          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test'] |  | ||||||
|   #          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] |  | ||||||
|   #      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON |  | ||||||
| 
 | 
 | ||||||
|     - os: osx |     - os: osx | ||||||
|       osx_image: xcode7.3 |       osx_image: xcode7.3 | ||||||
| @ -124,6 +121,13 @@ before_install: | |||||||
|   - export PATH=${DEPS_DIR}/bin:${PATH} && mkdir -p ${DEPS_DIR} |   - export PATH=${DEPS_DIR}/bin:${PATH} && mkdir -p ${DEPS_DIR} | ||||||
|   - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/3.5.2.tar.gz" |   - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/3.5.2.tar.gz" | ||||||
|   - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR} |   - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR} | ||||||
|  |   - | | ||||||
|  |     if [[ ${CLANG_VERSION:-false} != false ]]; then | ||||||
|  |       export CCOMPILER='clang' | ||||||
|  |       export CXXCOMPILER='clang++' | ||||||
|  |       CLANG_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/clang/${CLANG_VERSION}.tar.gz" | ||||||
|  |       travis_retry wget --quiet -O - ${CLANG_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR} | ||||||
|  |     fi | ||||||
|   - | |   - | | ||||||
|     if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then |     if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then | ||||||
|       # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost |       # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user