diff options
| author | Katelyn Gadd <kg@luminance.org> | 2019-03-29 18:39:11 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-03-29 18:39:11 +0300 |
| commit | 0de947787c5bbbac667a1a5ad1cc81c82e352cae (patch) | |
| tree | 58ba5beeba0ac521ed2e55261c2d20789ef0a9fa /mcs/packages | |
| parent | 3eef668848b3e0575309543f8f1b4826890c67aa (diff) | |
Add missing roslyn assemblies to mcs package makefile (#13738)
* Add missing roslyn assemblies to mcs package makefile
* Remove deploy step for dynamic interface methods prototype since current roslyn has DIM
Roslyn picked up some new dependencies that I failed to add to a Makefile containing a list of its dependencies. This may fix some scenarios (not covered by CI) that result in csc and/or msbuild not working.
Diffstat (limited to 'mcs/packages')
| -rw-r--r-- | mcs/packages/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mcs/packages/Makefile b/mcs/packages/Makefile index 3a1d320918f..51cd0a162e5 100644 --- a/mcs/packages/Makefile +++ b/mcs/packages/Makefile @@ -20,6 +20,8 @@ ROSLYN_FILES_FOR_MONO = \ $(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.Scripting.dll \ $(ROSLYN_CSC_DIR)/System.Collections.Immutable.dll \ $(ROSLYN_CSC_DIR)/System.Reflection.Metadata.dll \ + $(ROSLYN_CSC_DIR)/System.Threading.Tasks.Extensions.dll \ + $(ROSLYN_CSC_DIR)/System.Memory.dll \ $(ROSLYN_CSC_DIR)/VBCSCompiler.exe \ $(ROSLYN_CSC_DIR)/VBCSCompiler.exe.config @@ -29,8 +31,6 @@ ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \ $(ROSLYN_CSC_DIR)/Microsoft.Managed.Core.targets \ $(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets -ROSLYN_DIM_FILES = $(topdir)/../external/roslyn-binaries/Prototypes/DefaultInterfaceImplementation/* - DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-test.csx ifeq ($(PROFILE), $(DEFAULT_PROFILE)) @@ -38,7 +38,7 @@ ifeq ($(PROFILE), $(DEFAULT_PROFILE)) TARGET_DIR = $(DESTDIR)$(mono_libdir)/mono/$(FRAMEWORK_VERSION) MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/Current/bin/Roslyn -install-local: install-prototypes +install-local: $(MKINSTALLDIRS) $(TARGET_DIR) $(INSTALL_LIB) $(ROSLYN_FILES_FOR_MONO) $(TARGET_DIR) $(MKINSTALLDIRS) $(MSBUILD_ROSLYN_DIR) @@ -46,10 +46,6 @@ install-local: install-prototypes (cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_FOR_MONO); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$(basename $$asm) . ; done) -install-prototypes: - $(MKINSTALLDIRS) $(TARGET_DIR)/dim - $(INSTALL_LIB) $(ROSLYN_DIM_FILES) $(TARGET_DIR)/dim - run-test-local: test-csi test-csi: |