From a0105b1097d69d8baef52d8fc7a8bffb72698f6f Mon Sep 17 00:00:00 2001
From: Austin Wise <AustinWise@gmail.com>
Date: Sat, 29 Apr 2023 20:49:00 -0700
Subject: [PATCH] Native DLLs: only load imported DLLs from System32

---
 eng/native/configurecompiler.cmake | 3 +++
 eng/native/ijw/IJW.cmake           | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
index 24ab3c8cd96bb1..2844ba66293dda 100644
--- a/eng/native/configurecompiler.cmake
+++ b/eng/native/configurecompiler.cmake
@@ -70,6 +70,9 @@ if (MSVC)
   add_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:CLR_EH_OPTION>>)
   add_link_options($<$<BOOL:$<TARGET_PROPERTY:CLR_CONTROL_FLOW_GUARD>>:/guard:cf>)
 
+  # Load all imported DLLs from the System32 directory.
+  add_linker_flag(/DEPENDENTLOADFLAG:0x800)
+
   # Linker flags
   #
   set (WINDOWS_SUBSYSTEM_VERSION 6.01)
diff --git a/eng/native/ijw/IJW.cmake b/eng/native/ijw/IJW.cmake
index 4d145a68470a89..2529ec596f3bc3 100644
--- a/eng/native/ijw/IJW.cmake
+++ b/eng/native/ijw/IJW.cmake
@@ -64,6 +64,10 @@ if (CLR_CMAKE_HOST_WIN32)
   remove_ijw_incompatible_options("${dirCompileOptions}" dirCompileOptions)
   set_directory_properties(PROPERTIES COMPILE_OPTIONS "${dirCompileOptions}")
 
+  # IJW tests needs to load DLLs from somewhere other than System32
+  string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+  string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+
   set(CLR_SDK_REF_PACK_OUTPUT "")
   set(CLR_SDK_REF_PACK_DISCOVERY_ERROR "")
   set(CLR_SDK_REF_PACK_DISCOVERY_RESULT 0)