From d976580bd0d67d73f6e6f08f4c2f44a3e348a4b3 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 2 Feb 2011 12:31:53 +0000 Subject: [PATCH] Compile&Run runtime tests with 4.0 corlib --- mono/mini/Makefile.am | 4 ++-- mono/tests/Makefile.am | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 33de0e42fb3..879147f9c00 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -45,14 +45,14 @@ sgenstatic_libs = \ $(monodir)/mono/utils/libmonoutils.la \ $(GLIB_LIBS) -CLASS=$(mcs_topdir)/class/lib/net_2_0 +CLASS=$(mcs_topdir)/class/lib/net_4_0 RUNTIME_EXECUTABLE = $(if $(SGEN),$(top_builddir)/mono/mini/mono-sgen,$(top_builddir)/runtime/mono-wrapper) RUNTIME = MONO_PATH=$(CLASS) $(RUNTIME_EXECUTABLE) RUNTIME_AOTCHECK = MONO_PATH=$(CLASS):. $(RUNTIME_EXECUTABLE) -MCS = $(RUNTIME_EXECUTABLE) $(mcs_topdir)/class/lib/build/mcs.exe -sdk:2 -unsafe -nowarn:0162 +MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -nowarn:0162 ILASM = $(RUNTIME) $(CLASS)/ilasm.exe AM_CFLAGS = \ diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index 5ec82d84542..7e00b1ccb68 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -13,7 +13,7 @@ JITTEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime MONO_CFG_DIR=$(mon RUNTIME_ARGS=--config tests-config --optimize=all --debug -with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_2_0 +with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_4_0 with_mono_path_moonlight = MONO_PATH=$(mcs_topdir)/class/lib/moonlight_raw RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper @@ -21,10 +21,10 @@ RUNTIME_MOONLIGHT = $(with_mono_path_moonlight) $(top_builddir)/runtime/mono-wra MKBUNDLE = \ PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \ - $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/mkbundle.exe + $(RUNTIME) $(mcs_topdir)/class/lib/net_4_0/mkbundle.exe -MCS = $(top_builddir)/runtime/mono-wrapper $(mcs_topdir)/class/lib/build/mcs.exe -sdk:2 -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219 -debug -ILASM = $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/ilasm.exe +MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219 -debug +ILASM = $(RUNTIME) $(mcs_topdir)/class/lib/net_4_0/ilasm.exe BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs -- 2.25.1