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/Microsoft.Build.Tasks | |
| 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/Microsoft.Build.Tasks')
| -rw-r--r-- | mcs/class/Microsoft.Build.Tasks/Makefile | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/mcs/class/Microsoft.Build.Tasks/Makefile b/mcs/class/Microsoft.Build.Tasks/Makefile index 66b74a84728..d451c754e74 100644 --- a/mcs/class/Microsoft.Build.Tasks/Makefile +++ b/mcs/class/Microsoft.Build.Tasks/Makefile @@ -9,28 +9,14 @@ LIBRARY = Microsoft.Build.Tasks.dll LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll -LIB_REFS = System System.Core System.Xml System.Windows.Forms -LIB_MCS_FLAGS = \ - /r:$(corlib) \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Xml.dll \ - /r:System.Windows.Forms.dll \ - /r:$(XBUILD_UTILITIES) \ - /r:$(XBUILD_FRAMEWORK) \ - /r:$(XBUILD_ENGINE) \ - /r:$(XBUILD_TASKS) - -TEST_MCS_FLAGS = \ - /r:System.Xml.dll \ - /r:$(XBUILD_ENGINE) \ - /r:$(XBUILD_FRAMEWORK) \ - /r:$(XBUILD_TASKS) \ - /r:$(XBUILD_UTILITIES) \ - /r:System.Core.dll +LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(PARENT_PROFILE)System.Windows.Forms \ + $(XBUILD_UTILITIES) $(XBUILD_FRAMEWORK) $(XBUILD_ENGINE) $(XBUILD_TASKS) + +TEST_MCS_FLAGS = +TEST_LIB_REFS = $(PARENT_PROFILE)System.Xml $(XBUILD_ENGINE) $(XBUILD_FRAMEWORK) $(XBUILD_TASKS) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Core ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) - TEST_MCS_FLAGS += /r:Microsoft.Build.dll +TEST_LIB_REFS += Microsoft.Build endif EXTRA_DISTFILES = \ @@ -41,7 +27,7 @@ EXTRA_DISTFILES = \ Test/test-config-file* Test/resources/test.dll: Test/resources/test.cs - $(CSCOMPILE) -target:library Test/resources/test.cs + $(CSCOMPILE) -target:library /out:$@ $< clean-test-resources: rm -f Test/resources/test.dll |