diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-06 23:19:26 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-06 23:19:26 -0500 |
| commit | b12e5fa8bd5f988621f37a75a4aea09a8dc82c5f (patch) | |
| tree | 1342cbdb1d8b94817e9ec4c9927c764a26eaba43 | |
| parent | 9b19335c6ed02963dc54c96aeb757fa98e736440 (diff) | |
| download | rneovim-b12e5fa8bd5f988621f37a75a4aea09a8dc82c5f.tar.gz rneovim-b12e5fa8bd5f988621f37a75a4aea09a8dc82c5f.tar.bz2 rneovim-b12e5fa8bd5f988621f37a75a4aea09a8dc82c5f.zip | |
CI/travis: Move check to before_script.sh.
Avoids some duplication.
| -rwxr-xr-x | .ci/before_script.sh | 4 | ||||
| -rw-r--r-- | .ci/common/build.sh | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/.ci/before_script.sh b/.ci/before_script.sh index 026ab0afc9..6babc582ea 100755 --- a/.ci/before_script.sh +++ b/.ci/before_script.sh @@ -19,6 +19,10 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the echo "\$LLVM_SYMBOLIZER: '${LLVM_SYMBOLIZER}' is not executable." exit 1 fi +if [ "${BUILD_32BIT}" = ON ] && [ "${BUILD_MINGW}" = ON ]; then + >&2 echo "32-bit MinGW builds not supported." + exit 1 +fi if [[ "${TRAVIS_OS_NAME}" == osx ]]; then # Adds user to a dummy group. diff --git a/.ci/common/build.sh b/.ci/common/build.sh index 3d517b9b09..f635ee4960 100644 --- a/.ci/common/build.sh +++ b/.ci/common/build.sh @@ -1,10 +1,5 @@ build_deps() { if [[ "${BUILD_32BIT}" == ON ]]; then - if [[ "${BUILD_MINGW}" == ON ]]; then - >&2 echo "32-bit MinGW builds not supported." - exit 1 - fi - DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" fi if [[ "${BUILD_MINGW}" == ON ]]; then @@ -42,11 +37,6 @@ build_nvim() { CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON" fi if [[ "${BUILD_32BIT}" == ON ]]; then - if [[ "${BUILD_MINGW}" == ON ]]; then - >&2 echo "32-bit MinGW builds not supported." - exit 1 - fi - CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" fi if [[ "${BUILD_MINGW}" == ON ]]; then |