From 3d3c783fead3dc328ede3ccd0fb7b3befcad191a Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 3 Oct 2019 05:40:25 +0200 Subject: ci: Travis: simplify 32bit build (#11093) - `CMAKE_SYSTEM_LIBRARY_PATH` should not be used, and is a semicolon-separated list anyway [1] 1: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_LIBRARY_PATH.html --- ci/common/build.sh | 6 ------ 1 file changed, 6 deletions(-) (limited to 'ci') diff --git a/ci/common/build.sh b/ci/common/build.sh index 8e9b2f8ebb..02e1110a15 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -18,9 +18,6 @@ build_make() { } build_deps() { - if test "${BUILD_32BIT}" = ON ; then - DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" - fi if test "${FUNCTIONALTEST}" = "functionaltest-lua" \ || test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON" @@ -53,9 +50,6 @@ prepare_build() { if test -n "${CLANG_SANITIZER}" ; then CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON" fi - if test "${BUILD_32BIT}" = ON ; then - CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" - fi mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" -- cgit