From 3c45edc397c72719038f85b5f527d350b63b0f5f Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Tue, 20 Apr 2021 13:24:08 -0400 Subject: [PATCH] Clean up darwin build flags --- indra/cmake/00-Common.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index f3e20ad2cae..8872a8f973b 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -276,14 +276,12 @@ endif (LINUX) if (DARWIN) - # Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default - set(CLANG_DISABLE_FATAL_WARNINGS OFF) add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION) set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(DARWIN_extra_cstar_flags "-gdwarf-2 -Wno-unused-local-typedef") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DARWIN_extra_cstar_flags}") + set(DARWIN_extra_cstar_flags "-gdwarf-2") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Ofast ${DARWIN_extra_cstar_flags}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast ${DARWIN_extra_cstar_flags}") # NOTE: it's critical that the optimization flag is put in front. # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. -- GitLab