From a5f331afc047379740fbf709cf0e4c06b2ed1e4d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 12 Jun 2024 10:17:44 +1000 Subject: [PATCH] Fix linux build error in x265.cmake The `ar` wrapper script wasn't handling arguments correctly, causing it not to merge x265 static libraries. --- build_files/build_environment/cmake/x265.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build_files/build_environment/cmake/x265.cmake b/build_files/build_environment/cmake/x265.cmake index f3fcca7caa7..1d3c2444c70 100644 --- a/build_files/build_environment/cmake/x265.cmake +++ b/build_files/build_environment/cmake/x265.cmake @@ -137,8 +137,12 @@ SAVE END ") file(WRITE ${_ar_cmake} "\ -set(ARG_AR $\{CMAKE_ARGV0\}) -set(ARG_AR_INPUT $\{CMAKE_ARGV1\}) +math(EXPR INDEX_AR \"$\{CMAKE_ARGC\}-2\") +math(EXPR INDEX_AR_INPUT \"$\{CMAKE_ARGC\}-1\") + +set(ARG_AR $\{CMAKE_ARGV$\{INDEX_AR\}\}) +set(ARG_AR_INPUT $\{CMAKE_ARGV$\{INDEX_AR_INPUT\}\}) + execute_process( COMMAND $\{ARG_AR\} -M INPUT_FILE $\{ARG_AR_INPUT\}