[build] Use LOCAL_MCS_FLAGS to give preference to the intermediate dir in System...

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index 9299f03c01b3ad2e683f3a658a64b8f192632e5f..50bc1fce7d1f6e3b9c1210b39e819903e76ed802 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -47,7 +47,8 @@ endif
 # Flags used to build the secxml version of System.
 #
 ifeq (secxml/, $(intermediate))
-LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -lib:$(bare_libdir) -r:PrebuiltSystem=$(bare_libdir)/System.dll -r:System.Xml.dll -r:MonoSecurity=Mono.Security.dll
+LOCAL_MCS_FLAGS = -lib:$(bare_libdir) 
+LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(bare_libdir)/System.dll -r:System.Xml.dll -r:MonoSecurity=Mono.Security.dll
 endif
 
 #

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 3000f81971b1ccdc94ecbda7dee4befe574c257f..e716ed1a06086eb00e59baf9dc8f9e606cd66200 100644 (file)
--- 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 = $(RESOURCE_FILES:%=-resource:%)
-LIBRARY_USE_INTERMEDIATE_FILE = yes
+#LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 ifeq (basic, $(PROFILE))