From 9e4d9295f0fb299773324be6125c1d3b783ebef4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 27 Jun 2024 19:56:46 +0200 Subject: [PATCH] Fix: Compilation error of fribidi on macOS Fribidi uses Meson, which auto-detects presence of ccache and uses it when found. This could cause incorrect compilation results when doing a cross-compilation to different platforms on the same machine. Pass the typical configuration environment to the Meson setup, which takes care of specifying deployment targets and architecture as the compiler flags, preventing ccache from using result from a different architecture. This is similar to the Meson setup used for Harfbuzz and Epoxy. Pull Request: https://projects.blender.org/blender/blender/pulls/123828 --- build_files/build_environment/cmake/fribidi.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_files/build_environment/cmake/fribidi.cmake b/build_files/build_environment/cmake/fribidi.cmake index e2adb7bae0d..9f1790c6d39 100644 --- a/build_files/build_environment/cmake/fribidi.cmake +++ b/build_files/build_environment/cmake/fribidi.cmake @@ -12,7 +12,7 @@ ExternalProject_Add(external_fribidi DOWNLOAD_DIR ${DOWNLOAD_DIR} PREFIX ${BUILD_DIR}/fribidi - CONFIGURE_COMMAND + CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/fribidi ${MESON_BUILD_TYPE}