[Bf-blender-cvs] [0518bd85f1f] blender-v2.83-release: Fix merge error in apple build.

[Jeroen Bakker]

Commit: 0518bd85f1ffeb425ef0829ebe7b539325ba0f2a
Author: Jeroen Bakker
Date:   Mon Jul 26 10:32:38 2021 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB0518bd85f1ffeb425ef0829ebe7b539325ba0f2a

Fix merge error in apple build.

===================================================================

M	build_files/cmake/platform/platform_apple.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 003c07e7b23..cfe42176413 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -440,13 +440,8 @@ if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
   endif()
 else()
-<<<<<<< HEAD
-  set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
-  set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
-=======
-  set(CMAKE_C_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
-  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
->>>>>>> fc6a1f44d2e (macOS: use -fno-strict-aliasing for all build types.)
+  set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic")
+  set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic")
 endif()
 
 if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)