From 9c81799a25a83056c37e671cefeab6cefe043000 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Fri, 19 Apr 2019 09:08:12 -0700 Subject: [PATCH] Move CLR_ADDITIONAL_COMPILER_OPTIONS to be set after default options (#24044) CLR_ADDITIONAL_COMPILER_OPTIONS was set before visibility settings and thus adding additional compiler options would be overwritten. --- configurecompiler.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configurecompiler.cmake b/configurecompiler.cmake index c893e44..929dfe5 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -323,7 +323,6 @@ endif(WIN32) if(CLR_CMAKE_PLATFORM_UNIX) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CLR_ADDITIONAL_LINKER_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CLR_ADDITIONAL_LINKER_FLAGS}" ) - add_compile_options(${CLR_ADDITIONAL_COMPILER_OPTIONS}) endif(CLR_CMAKE_PLATFORM_UNIX) if(CLR_CMAKE_PLATFORM_LINUX) @@ -516,6 +515,10 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM) endif(ARM_SOFTFP) endif(CLR_CMAKE_PLATFORM_UNIX_ARM) +if(CLR_CMAKE_PLATFORM_UNIX) + add_compile_options(${CLR_ADDITIONAL_COMPILER_OPTIONS}) +endif(CLR_CMAKE_PLATFORM_UNIX) + if (WIN32) # Compile options for targeting windows -- 2.7.4