summaryrefslogtreecommitdiff
path: root/configurecompiler.cmake
diff options
context:
space:
mode:
authorAndrew Wang <waan@microsoft.com>2019-04-19 16:08:12 (GMT)
committerJan Kotas <jkotas@microsoft.com>2019-04-19 16:08:12 (GMT)
commit9c81799a25a83056c37e671cefeab6cefe043000 (patch)
tree5669472ad7989870a7ae09e4c1c07180a112af73 /configurecompiler.cmake
parent92750102f85e4fedfdc6df2e65507ccd250d1d78 (diff)
downloadcoreclr-9c81799a25a83056c37e671cefeab6cefe043000.zip
coreclr-9c81799a25a83056c37e671cefeab6cefe043000.tar.gz
coreclr-9c81799a25a83056c37e671cefeab6cefe043000.tar.bz2
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.
Diffstat (limited to 'configurecompiler.cmake')
-rw-r--r--configurecompiler.cmake5
1 files changed, 4 insertions, 1 deletions
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