10 files changed, 21 insertions, 5 deletions
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 56b8470a328..511aed95129 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -66,6 +66,12 @@ else
 the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/
 endif
 
+ifdef RESOURCE_STRINGS
+ifdef BOOTSTRAP_PROFILE
+MCS_FLAGS_INTERNAL += --getresourcestrings:$(RESOURCE_STRINGS)
+endif
+endif
+
 #
 # The bare directory contains the plain versions of System and System.Xml
 #
diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 645a90d7dc9..0f1393afdd8 100644
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -28,7 +28,7 @@ ifndef BUILD_TOOLS_PROFILE
 BUILD_TOOLS_PROFILE = build
 endif
 
-USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
+USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) $(MCS_FLAGS_INTERNAL)
 USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
 USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
 CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Makefile b/mcs/class/System.ComponentModel.DataAnnotations/Makefile
index 0194ca3f736..cd722af91ee 100644
--- a/mcs/class/System.ComponentModel.DataAnnotations/Makefile
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Makefile
@@ -11,4 +11,6 @@ LIB_MCS_FLAGS = \
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
+RESOURCE_STRINGS = ../../../external/referencesource/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.txt
+
 include ../../build/library.make
diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile
index 5e21343f14a..29ab2f6c231 100644
--- a/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@ -6,6 +6,7 @@ LIBRARY = System.Core.dll
 
 REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,PFX_LEGACY_3_5
 LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) -d:INSIDE_SYSCORE -d:LIBC /r:System.dll -unsafe
+RESOURCE_STRINGS = ../../../external/referencesource/System.Core/System.Core.txt
 
 ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
diff --git a/mcs/class/System.Data.Entity/Makefile b/mcs/class/System.Data.Entity/Makefile
index d3617e41f92..be8e132366a 100644
--- a/mcs/class/System.Data.Entity/Makefile
+++ b/mcs/class/System.Data.Entity/Makefile
@@ -7,4 +7,6 @@ LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll -r:System.Data.dll -r:System.Xm
 				-r:System.Runtime.Serialization.dll -r:System.ComponentModel.DataAnnotations.dll -r:System.Configuration.dll \
 				-warn:2
 
+RESOURCE_STRINGS = ../../../external/referencesource/System.Data.Entity/System.Data.Entity.txt
+
 include ../../build/library.make
diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index b9dd3113fcb..d2fdfba105b 100644
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -24,6 +24,8 @@ LIB_MCS_FLAGS += \
 	-r:System.Transactions.dll
 endif
 
+RESOURCE_STRINGS = ../../../external/referencesource/System.Data/system.data.txt
+
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.Core.dll -r:Mono.Data.Sqlite.dll -nowarn:618,169,612,219,168
 
 TEST_MONO_PATH = .
diff --git a/mcs/class/System.Numerics/Makefile b/mcs/class/System.Numerics/Makefile
index 631ca66e758..543eb96d222 100644
--- a/mcs/class/System.Numerics/Makefile
+++ b/mcs/class/System.Numerics/Makefile
@@ -6,6 +6,8 @@ LIBRARY = System.Numerics.dll
 LIB_MCS_FLAGS = -r:System.dll /unsafe -d:MONO
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
+RESOURCE_STRINGS = ../../../external/referencesource/System.Numerics/System.Numerics.txt
+
 EXTRA_DISTFILES =
 
 include ../../build/library.make
diff --git a/mcs/class/System.Runtime.Serialization/Makefile b/mcs/class/System.Runtime.Serialization/Makefile
index 85515df667b..a11b3e30994 100644
--- a/mcs/class/System.Runtime.Serialization/Makefile
+++ b/mcs/class/System.Runtime.Serialization/Makefile
@@ -14,6 +14,8 @@ LIB_MCS_FLAGS = \
 		/r:System.Core.dll \
 		$(RESOURCE_FILES:%=/resource:%)
 
+RESOURCE_STRINGS = ../../../external/referencesource/System.Runtime.Serialization/System.Runtime.Serialization.txt
+
 ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += /d:NET_3_0 /r:System.Data.dll /r:System.Configuration.dll
 endif
diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index f5aa6a97501..85236a2dc27 100644
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -27,6 +27,8 @@ LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -uns
 TEST_MCS_FLAGS += -r:System.Configuration
 PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE))
 
+RESOURCE_STRINGS = ../../../external/referencesource/System/System.txt
+
 ifeq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:INSIDE_SYSTEM
 endif
diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 5d461be0e2d..1c17c808861 100644
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -21,9 +21,7 @@ $(error Unknown framework version)
 endif
 endif
 
-ifdef BOOTSTRAP_PROFILE
-LIB_MCS_FLAGS += --getresourcestrings:../../../external/referencesource/mscorlib/mscorlib.txt
-endif
+RESOURCE_STRINGS = ../../../external/referencesource/mscorlib/mscorlib.txt
 
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
@@ -64,7 +62,6 @@ EXTRA_DISTFILES = \
 	Test/resources/415628.bin		\
 	Test/resources/Fergie.GED		\
 	Test/resources/culture-*.cs		\
-	../../../external/referencesource/mscorlib/mscorlib.txt		\
 	$(RESOURCE_FILES) \
 	$(TEST_RESOURCES:.resources=.resx)