DISABLED_FEATURES=none
+
+AC_ARG_WITH(mcs-compiler, [ --with-mcs-compiler=yes,no Changes C# compiler used for compilation to be mcs instead of default csc],[],[with_mcs_compiler=no])
+
#
# Set the build profiles and options before things which use them
#
AC_ARG_WITH(aot_hybrid, [ --with-aot_hybrid=yes,no If you want to build the aot_hybrid assemblies (defaults to no)], [], [with_aot_hybrid=default])
AC_ARG_WITH(aot_only, [ --with-aot_only=yes,no If you want to build the aot_only assemblies (defaults to no)], [], [with_aot_only=default])
-AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,aot_hybrid,aot_only,bitcode_aot_only Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
+AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,aot_preferred,aot_only,bitcode_aot_only Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
dnl
dnl Profile defaults
AOT_BUILD_FLAGS="--aot=llvmonly,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--llvmonly"
-elif test x$with_runtime_preset = xhybrid; then
+elif test x$with_runtime_preset = xaot_preferred; then
DISABLE_MCS_DOCS_default=yes
with_aot_hybrid_default=yes
TEST_PROFILE=aot_hybrid
mono_runtime=mono/mini/mono
AC_SUBST(mono_runtime)
+CSC=$mono_build_root/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.1.3.2/tools/csc.exe
+
mono_cfg_root=$mono_build_root/runtime
if test x$host_win32 = xyes; then
if test "x$cross_compiling" = "xno"; then
mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
+ CSC="'"`cygpath -w -a $CSC`"'"
else
mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\'`\\etc
fi
fi
AC_SUBST(mono_cfg_dir)
+AC_SUBST(CSC)
+
AC_CONFIG_FILES([po/mcs/Makefile.in])
AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
echo "BCL_OPTIMIZE = 1" >> $srcdir/$mcsdir/build/config.make
fi
+ echo "CSC_LOCATION = $CSC" >> $srcdir/$mcsdir/build/config.make
+
+ if test "x$with_mcs_compiler" = "xyes"; then
+ echo "MCS_MODE = 1" >> $srcdir/$mcsdir/build/config.make
+ fi
+
if test "x$AOT_BUILD_FLAGS" != "x" ; then
echo "AOT_RUN_FLAGS=$AOT_RUN_FLAGS" >> $srcdir/$mcsdir/build/config.make
echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make