Skip to content

Commit 89d772a

Browse files
authored
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.
1 parent e9d3af5 commit 89d772a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mcs/class/corlib/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
66
LIBRARY = corlib.dll
77
LIBRARY_NAME = mscorlib.dll
88

9-
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%)
9+
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%) $(UNICODECHARINFO:%=-resource:%)
1010

1111
USE_XTEST_REMOTE_EXECUTOR = YES
1212
LIBRARY_WARN_AS_ERROR = yes
@@ -95,7 +95,6 @@ else
9595
endif
9696

9797
RESOURCE_FILES = \
98-
$(UNICODECHARINFO) \
9998
$(MANAGED_COLLATOR_RESOURCES_FILES) \
10099
LinkerDescriptor/mscorlib.xml
101100

@@ -207,6 +206,7 @@ EXTRA_DISTFILES = \
207206
$(RESOURCE_FILES) \
208207
$(TEST_RESOURCE_FILES) \
209208
$(TEST_RESOURCES:.resources=.resx) \
209+
resources/charinfo.nlp \
210210
LinkerDescriptor/mscorlib_test.xml
211211

212212
TEST_RESOURCE_FILES = \

0 commit comments

Comments
 (0)