if test x$USE_NLS = xprofile_default; then
-if test x$host_darwin = xyes; then
-# We make the default value for USE_NLS
-# "no" on OSX because it isn't available on most
-# default OSX installs. The most common configurations will
-# all disable it, so this saves us typing.
- USE_NLS=no
- AC_SUBST([USE_NLS])
- AC_MSG_RESULT([$USE_NLS])
-else
- USE_NLS=yes
- AC_SUBST([USE_NLS])
- AC_MSG_RESULT([$USE_NLS])
-fi
+ AC_MSG_CHECKING([NLS used])
+
+ # We make the default value for USE_NLS
+ # "no" on OSX because it isn't available on most
+ # default OSX installs. The most common configurations will
+ # all disable it, so this saves us typing.
+ if test x$host_darwin = xyes; then
+ USE_NLS=no;
+ else
+ USE_NLS=yes;
+ fi
+ AC_SUBST([USE_NLS])
+ AC_MSG_RESULT([$USE_NLS])
fi
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier,
- reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
+ reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting,
security, lldb, mdb, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
[
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
AC_MSG_NOTICE([Disabled String normalization support.])
fi
-if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then
- AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.])
- AC_MSG_NOTICE([Disabled Assembly remapping.])
+#TODO: remove assembly_remapping feature name once everyone is using desktop_loader
+if test "x$mono_feature_disable_assembly_remapping" = "xyes" || test "x$mono_feature_disable_desktop_loader" = "xyes"; then
+ AC_DEFINE(DISABLE_DESKTOP_LOADER, 1, [Disable desktop assembly loader semantics.])
+ AC_MSG_NOTICE([Disabled desktop assembly loader semantics.])
fi
if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then
dnl Boehm GC configuration
dnl
-AC_ARG_WITH(libgc, [ --with-gc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included])
+AC_ARG_WITH(libgc, [ --with-libgc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included])
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
;;
xsgen)
- AC_MSG_WARN("Use --with-sgen instead, --with-gc= controls Boehm configuration")
+ AC_MSG_WARN("Use --with-sgen instead, --with-libgc= controls Boehm configuration")
;;
xnone)
gc_msg="none"
;;
*)
- AC_MSG_ERROR([Invalid argument to --with-gc.])
+ AC_MSG_ERROR([Invalid argument to --with-libgc.])
;;
esac
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
fi
- AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties])
+ AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraries])
AC_SUBST(LLVM_CFLAGS)
AC_SUBST(LLVM_CXXFLAGS)
mono_runtime=mono/mini/mono
AC_SUBST(mono_runtime)
-CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.0.0/tools/csc.exe
+CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.1.0/tools/csc.exe
if test $csc_compiler = mcs; then
CSC=$mcs_topdir/class/lib/build/mcs.exe
mono/sgen/Makefile
mono/tests/Makefile
mono/tests/tests-config
-mono/tests/assemblyresolve/Makefile
mono/tests/gc-descriptors/Makefile
mono/tests/testing_gac/Makefile
mono/unit-tests/Makefile
echo "MONO_CORLIB_VERSION = $MONO_CORLIB_VERSION" >> $mcs_topdir/build/config.make
if test x$host_darwin = xyes; then
- echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make
+ echo "BUILD_PLATFORM = darwin" >> $mcs_topdir/build/config.make
+ elif test x$host_win32 = xyes; then
+ echo "BUILD_PLATFORM = win32" >> $mcs_topdir/build/config.make
+ else
+ echo "BUILD_PLATFORM = linux" >> $mcs_topdir/build/config.make
+ fi
+
+ if test x$host_darwin = xyes; then
+ echo "HOST_PLATFORM ?= darwin" >> $mcs_topdir/build/config.make
+ elif test x$host_win32 = xyes; then
+ echo "HOST_PLATFORM ?= win32" >> $mcs_topdir/build/config.make
+ else
+ echo "HOST_PLATFORM ?= linux" >> $mcs_topdir/build/config.make
fi
if test "x$PLATFORM_AOT_SUFFIX" != "x"; then