https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f82eb0fede4c3d93fde6122aafe0dd50600126fb

commit f82eb0fede4c3d93fde6122aafe0dd50600126fb
Author:     Victor Perevertkin <[email protected]>
AuthorDate: Wed Mar 3 05:00:33 2021 +0300
Commit:     Jérôme Gardou <[email protected]>
CommitDate: Wed Mar 3 08:34:32 2021 +0100

    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

Reply via email to