From 4febb6bc87f30a9eafaa007931d86478f23a5235 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 26 Feb 2020 10:47:33 -0500
Subject: [PATCH] Target 10.13 deployment on osx
---
indra/cmake/00-Common.cmake | 6 +-----
indra/cmake/Variables.cmake | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index cfce7aa55a..64c747de39 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -287,7 +287,7 @@ if (DARWIN)
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 -fobjc-arc -fno-strict-aliasing")
+ set(DARWIN_extra_cstar_flags "-gdwarf-2 -fobjc-arc -fno-strict-aliasing -faligned-allocation")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DARWIN_extra_cstar_flags}")
# NOTE: it's critical that the optimization flag is put in front.
@@ -302,10 +302,6 @@ if (DARWIN)
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_C_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_C_FLAGS_RELEASE}")
- if(USE_LTO)
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fforce-emit-vtables -fwhole-program-vtables")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fforce-emit-vtables -fwhole-program-vtables")
- endif()
endif()
endif (DARWIN)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 5402cb518d..ee75668a69 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -206,8 +206,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if (XCODE_VERSION LESS 10.2.0)
message( FATAL_ERROR "Xcode 10.2.0 or greater is required." )
endif (XCODE_VERSION LESS 10.2.0)
- message( "Building with " ${CMAKE_OSX_SYSROOT} )
- set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
+ message( "Building with " ${CMAKE_OSX_SYSROOT} )
+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
set(CMAKE_XCODE_GENERATE_SCHEME ON)
if (USE_ASAN)
--
GitLab