Skip to content

Commit

Permalink
Always include Unicode charinfo, so tar made in csc mode works in mcs…
Browse files Browse the repository at this point in the history
… 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.
  • Loading branch information
monojenkins authored May 25, 2020
1 parent e9d3af5 commit 89d772a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mcs/class/corlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -95,7 +95,6 @@ else
endif

RESOURCE_FILES = \
$(UNICODECHARINFO) \
$(MANAGED_COLLATOR_RESOURCES_FILES) \
LinkerDescriptor/mscorlib.xml

Expand Down Expand Up @@ -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 = \
Expand Down

0 comments on commit 89d772a

Please sign in to comment.