diff options
| author | Florian Walch <florian@fwalch.com> | 2015-07-05 10:52:36 +0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-07-08 07:42:16 -0300 |
| commit | d2eb4a934683b5da63000d8b79a0d4c9a314d1c0 (patch) | |
| tree | 36e2a564d18bea57f7f427c8a8acc1952190fa78 /cmake | |
| parent | bac2700e2f2aaa8842f8bd48ae54cc52703d7d6f (diff) | |
| download | rneovim-d2eb4a934683b5da63000d8b79a0d4c9a314d1c0.tar.gz rneovim-d2eb4a934683b5da63000d8b79a0d4c9a314d1c0.tar.bz2 rneovim-d2eb4a934683b5da63000d8b79a0d4c9a314d1c0.zip | |
Travis: Refactor CI files, use container infrastructure.
* Split build steps to utilize the Travis build lifecycle.
* Move shell code from `.travis.yml` into Bash files in `.ci/`,
one file for each step of the Travis build lifecycle.
* Use configuration variables in `.travis.yml` to change
build behavior (e.g. build 32-bit with `BUILD_32BIT=ON`).
* Keep all configuration in environment variables in
`.travis.yml`. In scripts, concatenate environment variables
according to configuration to change to different behavior.
* Add GCC 5 builds for Linux.
* Use Travis's caching feature [1] for third-party dependencies
and pip packages.
* Allow failures MSan, as the errors it reports have to be
fixed first.
Valgrind is still disabled, but can be enabled by setting
`env: VALGRIND=ON` for a job in `.travis.yml`.
[1] http://docs.travis-ci.com/user/caching
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/i386-linux-gnu.toolchain.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/i386-linux-gnu.toolchain.cmake b/cmake/i386-linux-gnu.toolchain.cmake index 5b3e02d18d..089e37e5e8 100644 --- a/cmake/i386-linux-gnu.toolchain.cmake +++ b/cmake/i386-linux-gnu.toolchain.cmake @@ -1,5 +1,7 @@ set(CMAKE_SYSTEM_PROCESSOR i386) set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION gnu) -set(CMAKE_C_COMPILER gcc) +if(NOT ${CMAKE_C_COMPILER}) + set(CMAKE_C_COMPILER gcc) +endif() set(CMAKE_C_COMPILER_ARG1 "-m32") |