diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-07-26 11:32:38 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-07-26 11:32:38 +0300 |
| commit | 0518bd85f1ffeb425ef0829ebe7b539325ba0f2a (patch) | |
| tree | 904b08bda06579a730cfa2068707f02a154de12b | |
| parent | 41d31be6377217cdc586d4c330c30df3496b8faf (diff) | |
Fix merge error in apple build.
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
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) |