diff options
| author | Marek Safar <marek.safar@gmail.com> | 2016-04-04 14:42:47 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2016-04-04 14:48:44 +0300 |
| commit | aeccd22792f34fb77c340180174f73f6c3270200 (patch) | |
| tree | 21343b9a17eb47414f28daba4a29d2f7b959b6ec /mcs/class/System.Web.Extensions | |
| parent | 3d180029fb2875865d51d03269cc71999e008104 (diff) | |
[build] Change the way how mcs references are passed to compiler to always use full path.
One of csc prerequisites because csc uses -lib as path which is considered after
RuntimeEnvironment.GetRuntimeDirectory which makes -lib useless
Diffstat (limited to 'mcs/class/System.Web.Extensions')
| -rw-r--r-- | mcs/class/System.Web.Extensions/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mcs/class/System.Web.Extensions/Makefile b/mcs/class/System.Web.Extensions/Makefile index bf15f32944f..4a3f8a48970 100644 --- a/mcs/class/System.Web.Extensions/Makefile +++ b/mcs/class/System.Web.Extensions/Makefile @@ -39,7 +39,7 @@ NUNIT_RESOURCE_FILES= \ CLASSLIB_DIR = $(topdir)/class/lib/$(PROFILE) STANDALONE_RUNNER_SUPPORT_ASSEMBLY = $(CLASSLIB_DIR)/standalone-runner-support.dll -STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -debug:full -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:System.Web.dll -r:System.Web.Extensions.dll -r:nunit.framework.dll +STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:$(topdir)/class/lib/$(PROFILE)/System.Web.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Web.Extensions.dll -r:$(topdir)/class/lib/$(PROFILE)/nunit.framework.dll STANDALONE_TEST_ASSEMBLY = System.Web.Extensions_standalone_test_$(PROFILE).dll STANDALONE_TEST_MAKEFRAG = $(depsdir)/$(STANDALONE_TEST_ASSEMBLY).makefrag @@ -49,20 +49,20 @@ ifdef TESTNAME RUN_STANDALONE += --test=$(TESTNAME) endif -ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) -OTHER_LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll -endif - LIB_REFS = System System.Core System.Drawing System.Data System.Data.Linq System.Xml System.Web System.Web.Services System.Configuration System.EnterpriseServices System.ServiceModel LIB_MCS_FLAGS = \ -unsafe \ -define:NET_3_5 \ -define:SYSTEM_WEB_EXTENSIONS \ - -r:$(corlib) \ $(OTHER_LIB_MCS_FLAGS) \ $(RESOURCE_FILES:%=/resource:%) -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%) -r:SystemWebTestShim.dll -define:SYSTEM_WEB_EXTENSIONS +ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) +LIB_REFS += System.Web.ApplicationServices +endif + +TEST_LIB_REFS = SystemWebTestShim +TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%) -define:SYSTEM_WEB_EXTENSIONS EXTRA_DISTFILES = $(RESOURCE_FILES_DIST) $(NUNIT_RESOURCE_FILES) \ System.Web.Extensions_standalone_test.dll.sources \ |