Fix LLVM NuGet binary placement and clean up changes

3 files changed, 1 insertions, 35 deletions

diff --git a/src/ILCompiler.Compiler/src/Compiler/LibraryInitializers.cs b/src/ILCompiler.Compiler/src/Compiler/LibraryInitializers.cs
index b48c8ebfd..69c9a1477 100644
--- a/src/ILCompiler.Compiler/src/Compiler/LibraryInitializers.cs
+++ b/src/ILCompiler.Compiler/src/Compiler/LibraryInitializers.cs
@@ -35,9 +35,8 @@ namespace ILCompiler
 
         private readonly TypeSystemContext _context;
         private readonly bool _isCppCodeGen;
-        private readonly bool _isWasmCodeGen;
 
-        public LibraryInitializers(TypeSystemContext context, bool isCppCodeGen, bool isWasmCodeGen)
+        public LibraryInitializers(TypeSystemContext context, bool isCppCodeGen)
         {
             _context = context;
             //
@@ -45,7 +44,6 @@ namespace ILCompiler
             // this can be useful to workaround CppCodeGen bugs.
             //
             _isCppCodeGen = isCppCodeGen;
-            _isWasmCodeGen = isWasmCodeGen;
         }
 
         public IList<MethodDesc> LibraryInitializerMethods
diff --git a/src/ILCompiler.Compiler/src/Compiler/RawMainMethodRootProvider.cs b/src/ILCompiler.Compiler/src/Compiler/RawMainMethodRootProvider.cs
deleted file mode 100644
index 20c292b60..000000000
--- a/src/ILCompiler.Compiler/src/Compiler/RawMainMethodRootProvider.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Internal.TypeSystem;
-using Internal.TypeSystem.Ecma;
-
-namespace ILCompiler
-{
-    public class RawMainMethodRootProvider : ICompilationRootProvider
-    {
-        private EcmaModule _module;
-
-        public RawMainMethodRootProvider(EcmaModule module)
-        {
-            _module = module;
-        }
-
-        public void AddCompilationRoots(IRootingServiceProvider rootProvider)
-        {
-            MethodDesc mainMethod = _module.EntryPoint;
-            if (mainMethod == null)
-                throw new Exception("No managed entrypoint defined for executable module");
-
-            TypeDesc owningType = _module.GetGlobalModuleType();
-
-            rootProvider.AddCompilationRoot(mainMethod, "Managed Main Method");
-        }
-    }
-}
diff --git a/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj b/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj
index 8e396e45f..8785265d2 100644
--- a/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj
+++ b/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj
@@ -297,7 +297,6 @@
     <Compile Include="Compiler\NodeMangler.cs" />
     <Compile Include="Compiler\ObjectDumper.cs" />
     <Compile Include="Compiler\PrecomputedMetadataManager.cs" />
-    <Compile Include="Compiler\RawMainMethodRootProvider.cs" />
     <Compile Include="Compiler\ReadyToRun.cs" />
     <Compile Include="Compiler\RyuJitCompilation.cs" />
     <Compile Include="Compiler\RyuJitCompilationBuilder.cs" />