diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-04-27 11:57:14 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-06-27 06:52:59 -0400 |
| commit | b235793dac131673abeb07393b49475e4f8a4393 (patch) | |
| tree | 0c30de12c7ee4538ccd230f02f2a3271a953fac2 /scripts/travis.sh | |
| parent | b17d9691a24099c9210289f16afb1a498a89d803 (diff) | |
| download | rneovim-b235793dac131673abeb07393b49475e4f8a4393.tar.gz rneovim-b235793dac131673abeb07393b49475e4f8a4393.tar.bz2 rneovim-b235793dac131673abeb07393b49475e4f8a4393.zip | |
Fix #838: build with "USE_BUNDLED=OFF" fails to find dependencies
Stop forcing some platform setting that are really intended to be used
for Travis CI. Under other systems, like Arch Linux, it prevents
dependencies from being correctly located.
Diffstat (limited to 'scripts/travis.sh')
| -rwxr-xr-x | scripts/travis.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index ec617a42c6..29ac33d737 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -173,7 +173,13 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then # correctly. sudo apt-get install libncurses5-dev:i386 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" unittest + CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP \ + -DCMAKE_SYSTEM_PROCESSOR=i386 \ + -DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \ + -DFIND_LIBRARY_USE_LIB64_PATHS=OFF \ + -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib \ + -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" + $MAKE_CMD CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" unittest $MAKE_CMD test elif [ "$TRAVIS_BUILD_TYPE" = "clint" ]; then ./scripts/clint.sh |