Skip to content

Commit 907ffde

Browse files
janisozaurNikolajBjorner
authored andcommitted
Drop explicit MSVC's DYNAMICBASE option setting in favour of defaults
This option is not supported on Arm64 and the defaults should be fine
1 parent 837651e commit 907ffde

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

cmake/msvc_legacy_quirks.cmake

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,6 @@ foreach (_build_type ${_build_types_as_upper})
169169
string(APPEND CMAKE_EXE_LINKER_FLAGS_${_build_type} " /TLBID:1")
170170
string(APPEND CMAKE_SHARED_LINKER_FLAGS_${_build_type} " /TLBID:1")
171171

172-
# FIXME: This is not necessary. This is MSVC's default.
173-
# Address space layout randomization
174-
# See https://msdn.microsoft.com/en-us/library/bb384887.aspx
175-
string(APPEND CMAKE_EXE_LINKER_FLAGS_${_build_type} " /DYNAMICBASE")
176-
if(ENABLE_CFI)
177-
# CFI requires /DYNAMICBASE to be enabled.
178-
string(APPEND CMAKE_SHARED_LINKER_FLAGS_${_build_type} " /DYNAMICBASE")
179-
else()
180-
string(APPEND CMAKE_SHARED_LINKER_FLAGS_${_build_type} " /DYNAMICBASE:NO")
181-
endif()
182-
183172
# FIXME: This is not necessary. This is MSVC's default.
184173
# Indicate that the executable is compatible with DEP
185174
# See https://msdn.microsoft.com/en-us/library/ms235442.aspx

0 commit comments

Comments
 (0)