From bfcf0d1d2cd754018e922d70e2d8ab0e7c6cc395 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 25 Aug 2024 14:41:04 +0800 Subject: Fix macOS architecture comparison operator cause they're not like 0 valued ${_binary}_installed that it would run lipo -thin on already thinned binaries. --- indra/cmake/CURL.cmake | 4 ++-- indra/cmake/XmlRpcEpi.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 26704e6934..08938ff3d8 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -16,7 +16,7 @@ use_prebuilt_binary(curl) OUTPUT_VARIABLE curl_archs OUTPUT_STRIP_TRAILING_WHITESPACE ) - if (NOT ${curl_archs} EQUAL ${CMAKE_OSX_ARCHITECTURES}) + if (NOT ${curl_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES}) execute_process( COMMAND lipo libcurl.a @@ -24,7 +24,7 @@ use_prebuilt_binary(curl) -output libcurl.a WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release ) - endif (NOT ${curl_archs} EQUAL ${CMAKE_OSX_ARCHITECTURES}) + endif (NOT ${curl_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES}) endif (DARWIN) elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/curl_installed OR NOT ${curl_installed} EQUAL 0) if (NOT EXISTS ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1.tar.gz) diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 756388957f..a008e06d62 100644 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -17,7 +17,7 @@ use_prebuilt_binary(xmlrpc-epi) OUTPUT_VARIABLE xmlrpc-epi_archs OUTPUT_STRIP_TRAILING_WHITESPACE ) - if (NOT ${xmlrpc-epi_archs} EQUAL ${CMAKE_OSX_ARCHITECTURES}) + if (NOT ${xmlrpc-epi_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES}) execute_process( COMMAND lipo libxmlrpc-epi.0.dylib @@ -25,7 +25,7 @@ use_prebuilt_binary(xmlrpc-epi) -output libxmlrpc-epi.0.dylib WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release ) - endif (NOT ${xmlrpc-epi_archs} EQUAL ${CMAKE_OSX_ARCHITECTURES}) + endif (NOT ${xmlrpc-epi_archs} STREQUAL ${CMAKE_OSX_ARCHITECTURES}) endif (DARWIN) endif (${LINUX_DISTRO} MATCHES opensuse-tumbleweed OR DARWIN OR NOT USESYSTEMLIBS) target_link_libraries(ll::xmlrpc-epi INTERFACE xmlrpc-epi ) -- cgit v1.2.3