From f82eb0fede4c3d93fde6122aafe0dd50600126fb Mon Sep 17 00:00:00 2001 From: Victor Perevertkin Date: Wed, 3 Mar 2021 05:00:33 +0300 Subject: [PATCH] this seem to be the only combination which works on msbuild-msvc --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 3d30e2ea362..980265dd54a 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -282,9 +282,9 @@ if(MSVC) add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER") add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER") else() - target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:512 /ALIGN:512) + target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) add_linker_script(freeldr_pe freeldr_i386.msvc.lds) - target_link_options(freeldr_pe_dbg PRIVATE /ignore:4078 /ignore:4254 /DRIVER /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) + target_link_options(freeldr_pe_dbg PRIVATE /ignore:4078 /ignore:4254 /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) add_linker_script(freeldr_pe_dbg freeldr_i386.msvc.lds) endif() # We don't need hotpatching