Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Werner <stewreo@gmail.com>2020-07-16 10:41:17 +0300
committerStefan Werner <stewreo@gmail.com>2020-07-16 10:41:17 +0300
commit14b888afea11b2a086983b4f2bb8f5e9dede935f (patch)
tree9a68c332ede76d239ee45e970171df6864bf4633 /build_files/build_environment/cmake/ssl.cmake
parenta2638d0f410770eab53dc2c65c69c1bf4db3fdf2 (diff)
parent9715ad5acad9a42b65efd64b6c7fbe157f949bfb (diff)
Merge branch 'master' into mac_arm64mac_arm64
Diffstat (limited to 'build_files/build_environment/cmake/ssl.cmake')
-rw-r--r--build_files/build_environment/cmake/ssl.cmake6
1 files changed, 1 insertions, 5 deletions
diff --git a/build_files/build_environment/cmake/ssl.cmake b/build_files/build_environment/cmake/ssl.cmake
index b7d0fd9e097..e1c168817f4 100644
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -20,11 +20,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
set(SSL_PATCH_CMD echo .)
if(APPLE)
- if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
- set(SSL_OS_COMPILER "blender-darwin-arm64")
- else()
- set(SSL_OS_COMPILER "blender-darwin-x86_64")
- endif()
+ set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
else()
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)