diff options
| author | Ankit Meel <ankitjmeel@gmail.com> | 2020-10-28 18:22:51 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-07-26 10:58:31 +0300 |
| commit | 41d31be6377217cdc586d4c330c30df3496b8faf (patch) | |
| tree | d058b2aa17417aa7b6fc1fb42eebdefa23761130 | |
| parent | b2f2daf21f787260bf43e3efe9e5a1893d63ceea (diff) | |
macOS: use -fno-strict-aliasing for all build types.
The old code was added in {rBbaa4a9c7d4dd}
While the hotfix committed in {rB2ddecfffc3d3a3a1db4ae45e8665ca} fixed
the id_management test, the correct reason was found at
https://bugs.llvm.org/show_bug.cgi?id=47984
This matches the behavior on Linux.
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 47e5b807be5..003c07e7b23 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -186,7 +186,7 @@ if(SYSTEMSTUBS_LIBRARY) list(APPEND PLATFORM_LINKLIBS SystemStubs) endif() -set(PLATFORM_CFLAGS "-pipe -funsigned-char") +set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing") set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework Metal -framework QuartzCore" ) @@ -430,8 +430,8 @@ endif() set(EXETYPE MACOSX_BUNDLE) -set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g") -set(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g") +set(CMAKE_C_FLAGS_DEBUG "-g") +set(CMAKE_CXX_FLAGS_DEBUG "-g") if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "i386") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic -msse -msse2 -msse3 -mssse3") set(CMAKE_C_FLAGS_RELEASE "-O2 -mdynamic-no-pic -msse -msse2 -msse3 -mssse3") @@ -440,8 +440,13 @@ 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.) endif() if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) |