a few nits

dotnet · Jul 16, 2020 · b7fa391 · b7fa391
1 parent 4b4f018
commit b7fa391
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/coreclr/src/vm/dllimport.cpp b/src/coreclr/src/vm/dllimport.cpp
@@ -6309,14 +6309,15 @@ namespace
 #if defined(TARGET_LINUX)
         if (g_coreclr_embedded)
         {
+            // this matches exactly the names in  Interop.Libraries.cs 
             static const LPCWSTR toRedirect[] = {
                 W("libSystem.Native"),
                 W("libSystem.IO.Compression.Native"),
                 W("libSystem.Net.Security.Native"),
                 W("libSystem.Security.Cryptography.Native.OpenSsl")
             };
 
-            int count = sizeof(toRedirect) / sizeof(toRedirect[0]);
+            int count = lengthof(toRedirect);
             for (int i = 0; i < count; ++i)
             {
                 if (wcscmp(wszLibName, toRedirect[i]) == 0)

diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
@@ -194,7 +194,7 @@ else()
         set(START_WHOLE_ARCHIVE -Wl,--whole-archive)
         set(END_WHOLE_ARCHIVE -Wl,--no-whole-archive)
     endif(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD OR CLR_CMAKE_TARGET_SUNOS)
-endif(CLR_CMAKE_TARGET_WIN32 OR CLR_CMAKE_TARGET_OSX)
+endif(NOT CLR_CMAKE_TARGET_LINUX)
 
 set_property(TARGET singlefilehost PROPERTY ENABLE_EXPORTS 1)