From 36426b0a68565cb6aad5695c570a2521f23152ea Mon Sep 17 00:00:00 2001 From: Ankit Meel Date: Sun, 22 Nov 2020 01:28:53 +0530 Subject: CMake/macOS: Replace -Xlinker with -Wl. Causes link issues on Xcode's "New Build System" which was introduced in Xcode 10 and is default on Xcode 12. https://devtalk.blender.org/t/16273 Differential Revision: https://developer.blender.org/D9624 Reviewed by: brecht, #platform_macos --- build_files/cmake/platform/platform_apple.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index b1168cf28da..e5ca15a03ba 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -337,7 +337,7 @@ if(WITH_CYCLES_EMBREE) find_package(Embree 3.8.0 REQUIRED) # Increase stack size for Embree, only works for executables. if(NOT WITH_PYTHON_MODULE) - string(APPEND PLATFORM_LINKFLAGS " -Xlinker -stack_size -Xlinker 0x100000") + string(APPEND PLATFORM_LINKFLAGS " -Wl,-stack_size,0x100000") endif() # Embree static library linking can mix up SSE and AVX symbols, causing @@ -450,7 +450,7 @@ endif() # Avoid conflicts with Luxrender, and other plug-ins that may use the same # libraries as Blender with a different version or build options. set(PLATFORM_LINKFLAGS - "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'" + "${PLATFORM_LINKFLAGS} -Wl,-unexported_symbols_list,'${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'" ) string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++") -- cgit v1.2.3