diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-01-17 14:59:41 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-01-17 15:05:03 +0300 |
| commit | 997a6529232b9f9a01c335620e1166b8f81a6161 (patch) | |
| tree | 99c7818ae75b69b2ce48c007f8ce35d3f6952c50 /acceptance-tests | |
| parent | bf5e2fa8b2bab201d33992b17dd0be44108d7d83 (diff) | |
[tests] Use correct MONO_PATH directory for tools like MCS/ILASM
We need to use the mcs/class/lib/build directory so Roslyn
works (it runs into AOT bugs in net_4_x).
This was fixed in a few other places already, fix more.
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index 6f4f2080ebf..2e47df81bd0 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -8,11 +8,12 @@ CLEANFILES = *.dll *.exe *.mdb EXTRA_DIST=README.md SUBMODULES.json versions.mk roslyn.mk coreclr.mk ms-test-suite.mk CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE) +TOOLS_CLASS=$(mcs_topdir)/class/lib/build -with_mono_path = MONO_PATH=$(CLASS) -RUNTIME = $(with_mono_path) $(abs_top_builddir)/runtime/mono-wrapper --debug -MCS = $(RUNTIME) $(CSC) -nologo -ILASM = $(RUNTIME) $(CLASS)/ilasm.exe +RUNTIME = MONO_PATH=$(CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug +TOOLS_RUNTIME = MONO_PATH=$(TOOLS_CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug +MCS = $(TOOLS_RUNTIME) $(CSC) -nologo -noconfig -lib:$(CLASS) -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll +ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe include versions.mk include profiler-stress.mk |