AC_ARG_ENABLE(system-aot, [ --enable-system-aot Enable the Ahead-Of-Time compilation of system assemblies during the build (on by default on some platforms)], enable_system_aot=$enableval, enable_system_aot=default)
DISABLED_FEATURES=none
+csc_compiler=default
+endian=unknown
+AC_C_BIGENDIAN([endian=big],[endian=little],[endian=unknown])
+AC_MSG_CHECKING([CSharp compiler to use])
+AC_ARG_WITH(csc, [ --with-csc=mcs,roslyn,default Configures the CSharp compiler to use],[
+ if test x$withval = xmcs; then
+ csc_compiler=mcs
+ elif test x$withval = xroslyn; then
+ csc_compiler=roslyn
+ elif test x$withval = xdefault; then
+ :
+ else
+ AC_MSG_ERROR([You must supply one of "mcs", "roslyn" or "default" to the --with-csc option])
+ fi
+],[csc_compiler=default])
+
+if test $csc_compiler = default; then
+ if test $endian = big; then
+ csc_compiler=mcs
+ elif test $endian = little; then
+ csc_compiler=roslyn
+ else
+ csc_compiler=mcs
+ fi
+fi
+AC_MSG_RESULT($csc_compiler)
#
# 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
AC_MSG_NOTICE([Disabled agent attach])
fi
-if test "x$mono_feature_disable_full_messages" = "xyes"; then
- AC_DEFINE(DISABLE_FULL_MESSAGES, 1, [Disables building in the full table of WAPI messages])
- AC_MSG_NOTICE([Disabled full messages for Win32 errors, only core message strings shipped])
-fi
-
if test "x$mono_feature_disable_verifier" = "xyes"; then
AC_DEFINE(DISABLE_VERIFIER, 1, [Disables the verifier])
AC_MSG_NOTICE([Disabled the metadata and IL verifiers])
# We have the new, three-parameter version
AC_MSG_RESULT(no)
])
-
+ AC_TRY_COMPILE([#include <sched.h>], [
+ CPU_COUNT((void *) 0);
+ ], [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(GLIBC_HAS_CPU_COUNT, 1, [GLIBC has CPU_COUNT macro in sched.h])
+ ], [
+ # We have the new, three-parameter version
+ AC_MSG_RESULT(no)
+ ])
dnl ******************************************************************
dnl *** Check for large file support ***
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 $csc_compiler = mcs; 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
echo "
mcs source: $mcsdir
+ C# Compiler: $csc_compiler
Engine:
Host: $host