search GAC for system dlls before searching path; don't compile libho…

…stfxr on linux; fix a typo
LADSoft · May 4, 2024 · 385cb8e · 385cb8e
1 parent cade111
commit 385cb8e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/dirs.mak b/src/dirs.mak
@@ -23,7 +23,7 @@
 
 ifeq "$(COMPILER)" "gcc-linux"
 
-DIRS := sqlite3 util objlib libhostfxr netlib occopt obrc ocpp ogrep oasm dlhex dlle dlmz dlpe dlpm olib olink \
+DIRS := sqlite3 util objlib netlib occopt obrc ocpp ogrep oasm dlhex dlle dlmz dlpe dlpm olib olink \
        oimplib omake onm orc occparse occpr occ occil coff2ieee gccocc arocc clocc linkocc libocc ieeeconvert
 else
 DIRS := sqlite3 util objlib libhostfxr netlib occopt obrc ocpp ogrep oasm dlhex dlle dlmz dlpe dlpm olib olink \

diff --git a/src/netlib/DotNetPELib.h b/src/netlib/DotNetPELib.h
@@ -764,7 +764,7 @@ namespace DotNetPELib
         bool IsPInvoke() const { return invokeMode_ == PInvoke; }
         ///** Add a local variable
         void AddLocal(Local *local);
-        const std::vector<Local *> const Locals() { return varList_; }
+        const std::vector<Local *>& Locals() { return varList_; }
 
         void Instance(bool instance);
         bool Instance() const { return !!(Flags().Value & Qualifiers::Instance); }

diff --git a/src/netlib/PEReader.cpp b/src/netlib/PEReader.cpp
@@ -256,10 +256,10 @@ int PEReader::ManagedLoad(std::string assemblyName, std::string path)
 int PEReader::ManagedLoad(std::string assemblyName, int major, int minor, int build, int revision)
 
 {
-    std::string path = SearchOnPath(assemblyName + ".dll");
+    std::string path = SearchForManagedFile(assemblyName, major, minor, build, revision);
     if (!path.size())
     {
-        path = SearchForManagedFile(assemblyName, major, minor, build, revision);
+        path = SearchOnPath(assemblyName + ".dll");
     }
     return ManagedLoad(assemblyName, path);
 }