diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2020-05-25 13:40:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 13:40:13 +0300 |
| commit | 89d772a3abb2c88ccd51032fa377ffffea4e5451 (patch) | |
| tree | edd78539bb44307f8c298e6914bdbbfdf0772706 /mcs/class | |
| parent | e9d3af508e46454389cb29836d19616eae1615c0 (diff) | |
Always include Unicode charinfo, so tar made in csc mode works in mcs mode (#19813)
As-is, a tarball created in Roslyn mode is missing the file charinfo.nlp, which mcs needs to build the classlib.
Backport of #19807.
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/corlib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 367b5362b65..e3996318868 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -6,7 +6,7 @@ export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib LIBRARY = corlib.dll LIBRARY_NAME = mscorlib.dll -LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%) +LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%) $(UNICODECHARINFO:%=-resource:%) USE_XTEST_REMOTE_EXECUTOR = YES LIBRARY_WARN_AS_ERROR = yes @@ -95,7 +95,6 @@ else endif RESOURCE_FILES = \ - $(UNICODECHARINFO) \ $(MANAGED_COLLATOR_RESOURCES_FILES) \ LinkerDescriptor/mscorlib.xml @@ -207,6 +206,7 @@ EXTRA_DISTFILES = \ $(RESOURCE_FILES) \ $(TEST_RESOURCE_FILES) \ $(TEST_RESOURCES:.resources=.resx) \ + resources/charinfo.nlp \ LinkerDescriptor/mscorlib_test.xml TEST_RESOURCE_FILES = \ |