From e71963a37e76bb52524e36816286db28fdbbcf57 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 6 Nov 2019 13:50:43 +0100 Subject: [PATCH] Buildbot: Ensure proper ABI is used This wasn't an issue in the real buildbot environment since the precompiled libraries are compiled with same ABI as the compiler used for Blender build. But it was causing issues when building Blender using buildbot scripts (for troubleshooting purposes) on a machine with different default compiler ABI. Usually ABI detection is happening in platform_unix.cmake when detecting whether there are any precompiled libraries folder available. This detection is not happening when library folder is provided explicitly, expecting ABI to be setup explicitly as well. --- build_files/buildbot/config/blender_linux.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 2047c28deb9..c970ae4c9c1 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -3,7 +3,9 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake") message(STATUS "Building in CentOS 7 64bit environment") + set(LIBDIR_NAME "linux_centos7_x86_64") +set(WITH_CXX11_ABI OFF CACHE BOOL "" FORCE) # Default to only build Blender set(WITH_BLENDER ON CACHE BOOL "" FORCE)