X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=962b70153a01688baf496c4ab7a84b9f2bc20a91;hb=36d414542691e3903a43f92c1215e3c2efeb9ffe;hp=0946284c263312177f477509f9048670d0f1751f;hpb=1055069416aec55bd8957582cedfde1a9c7cdab8;p=mono.git diff --git a/configure.ac b/configure.ac index 0946284c263..962b70153a0 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,11 @@ AC_SUBST(libmono_cflags) AC_SUBST(libmono_ldflags) # Variable to have relocatable .pc files (lib, or lib64) -reloc_libdir=`basename ${libdir}` +# realpath isn't always available, and requires that all but the tip of the provided +# path exists. Fall back to the old behaviour, but realpath allows depth >1 +# e.g. Debian puts Mono in /usr/bin and libs in /usr/lib/x86_64-linux-gnu/ which is +# too deep for the old method to work +reloc_libdir=`realpath --relative-to=${prefix} ${libdir} 2> /dev/null || basename ${libdir}` AC_SUBST(reloc_libdir) # Set to yes if Unix sockets cannot be created in an anonymous namespace @@ -113,6 +117,7 @@ case "$host" in libgc_threads=win32 with_sigaltstack=no with_tls=pthread + with_sgen_default_concurrent=yes LN_S=cp # This forces libgc to use the DllMain based thread registration code on win32 libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes" @@ -128,6 +133,7 @@ case "$host" in libgc_threads=pthreads with_sigaltstack=no use_sigposix=yes + with_sgen_default_concurrent=yes ;; *-*-kfreebsd*-gnu) CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread" @@ -138,6 +144,7 @@ case "$host" in need_link_unlink=yes with_sigaltstack=no use_sigposix=yes + with_sgen_default_concurrent=yes ;; *-*-*freebsd*) if test "x$PTHREAD_CFLAGS" = "x"; then @@ -161,6 +168,7 @@ case "$host" in libgc_threads=pthreads use_sigposix=yes has_dtrace=yes + with_sgen_default_concurrent=yes ;; *-*-*openbsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DPLATFORM_BSD -D_REENTRANT -DUSE_MMAP" @@ -175,6 +183,7 @@ case "$host" in libgc_threads=pthreads with_sigaltstack=no use_sigposix=yes + with_sgen_default_concurrent=yes ;; *-*-linux-android*) platform_android=yes @@ -238,6 +247,7 @@ case "$host" in disable_munmap=yes ;; esac + with_sgen_default_concurrent=yes ;; *-*-nacl*) CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP" @@ -310,8 +320,10 @@ case "$host" in CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS" CPPFLAGS_FOR_EGLIB="$CPPFLAGS_FOR_EGLIB $BROKEN_DARWIN_CPPFLAGS" CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS" + with_sgen_default_concurrent=yes ;; x*64-*-darwin*) + with_sgen_default_concurrent=yes ;; arm*-darwin*) has_dtrace=no @@ -527,7 +539,7 @@ AC_ARG_ENABLE(visibility-hidden, WARN='' if test x"$GCC" = xyes; then - WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value -Wno-attributes' + WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value -Wno-attributes -Wno-format-zero-length' # We require C99 with some GNU extensions, e.g. `linux` macro CFLAGS="$CFLAGS -std=gnu99" @@ -538,9 +550,6 @@ if test x"$GCC" = xyes; then # We rely on signed overflow to behave CFLAGS="$CFLAGS -fwrapv" - # We rely on zero length arrays in structs - CFLAGS="$CFLAGS -Wno-zero-length-array" - CFLAGS="$CFLAGS -DMONO_DLL_EXPORT" if test x"$disable_visibility_hidden" = xno; then # Don't export any symbols by default @@ -567,6 +576,8 @@ if test x"$GCC" = xyes; then # https://bugzilla.samba.org/show_bug.cgi?id=8118 WARN="$WARN -Qunused-arguments" WARN="$WARN -Wno-unused-function -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign -Wno-return-stack-address -Wno-constant-logical-operand" + # We rely on zero length arrays in structs + WARN="$WARN -Wno-zero-length-array" fi else # The Sun Forte compiler complains about inline functions that access static variables @@ -747,21 +758,48 @@ fi 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(profile4_x, [ --with-profile4=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4_x=default]) +AC_ARG_WITH(profile4_x, [ --with-profile4_x=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4_x=default]) AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=default]) AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=default]) AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you want to build the Xamarin.WatchOS assemblies (defaults to no)],[], [with_monotouch_watch=default]) AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to build the Xamarin.TVOS assemblies (defaults to no)], [], [with_monotouch_tv=default]) AC_ARG_WITH(bitcode, [ --with-bitcode=yes,no If bitcode is enabled (defaults to no)], [], [with_bitcode=default]) AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=default]) -AC_ARG_WITH(mobile_static, [ --with-mobile_static=yes,no If you want to build the mobile_static assemblies (defaults to no)], [], [with_mobile_static=default]) +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,mobile_static,bitcode_mobile_static 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 @@ -769,52 +807,35 @@ dnl TEST_PROFILE=default enable_llvm_default=no -INVARIANT_AOT_OPTIONS=nimt-trampolines=900,ntrampolines=8000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=2800 +with_profile4_x_default=no +with_monodroid_default=no +with_monotouch_default=no +with_monotouch_watch_default=no +with_monotouch_tv_default=no +with_xammac_default=no +with_aot_hybrid_default=no +with_aot_only_default=no + +with_bitcode_default=no +with_cooperative_gc_default=no + +INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=8000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000 if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then DISABLE_MCS_DOCS_default=yes - with_profile4_x_default=no - with_monodroid_default=no - with_monotouch_default=no - with_monotouch_watch_default=no - with_monotouch_tv_default=no - with_xammac_default=no - with_mobile_static_default=no - with_bitcode_default=no - with_cooperative_gc_default=no elif test x$with_runtime_preset = xnet_4_x; then - with_cooperative_gc_default=no with_profile4_x_default=yes - with_monodroid_default=no - with_monotouch_default=no - with_monotouch_watch_default=no - with_monotouch_tv_default=no - with_xammac_default=no - with_mobile_static_default=no - with_bitcode_default=no elif test x$with_runtime_preset = xall; then - with_cooperative_gc_default=no with_profile4_x_default=yes with_monodroid_default=yes with_monotouch_default=yes with_monotouch_watch_default=yes with_monotouch_tv_default=yes with_xammac_default=yes - with_mobile_static_default=no - with_bitcode_default=no -elif test x$with_runtime_preset = xmobile_static; then +elif test x$with_runtime_preset = xaot_only; then DISABLE_MCS_DOCS_default=yes - with_cooperative_gc_default=no - with_profile4_x_default=no - with_monodroid_default=no - with_monotouch_default=no - with_monotouch_watch_default=no - with_monotouch_tv_default=no - with_xammac_default=no - with_mobile_static_default=yes - with_bitcode_default=no - with_cooperative_gc_default=no - TEST_PROFILE=mobile_static + with_aot_only_default=yes + TEST_PROFILE=aot_only mono_feature_disable_com='yes' mono_feature_disable_remoting='yes' @@ -824,18 +845,12 @@ elif test x$with_runtime_preset = xmobile_static; then AOT_BUILD_FLAGS="-O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS" AOT_RUN_FLAGS="--full-aot" -elif test x$with_runtime_preset = xbitcode_mobile_static; then +elif test x$with_runtime_preset = xbitcode_aot_only; then DISABLE_MCS_DOCS_default=yes - with_profile4_x_default=no - with_monodroid_default=no - with_monotouch_default=no - with_monotouch_watch_default=no - with_monotouch_tv_default=no - with_xammac_default=no - with_mobile_static_default=yes + with_aot_only_default=yes with_bitcode_default=yes with_cooperative_gc_default=yes - TEST_PROFILE=mobile_static + TEST_PROFILE=aot_only enable_llvm_default=yes mono_feature_disable_com='yes' @@ -846,16 +861,20 @@ elif test x$with_runtime_preset = xbitcode_mobile_static; then AOT_BUILD_FLAGS="--aot=llvmonly,$INVARIANT_AOT_OPTIONS" AOT_RUN_FLAGS="--llvmonly" +elif test x$with_runtime_preset = xaot_preferred; then + DISABLE_MCS_DOCS_default=yes + with_aot_hybrid_default=yes + TEST_PROFILE=aot_hybrid + enable_llvm_default=yes + + mono_feature_disable_com='yes' + mono_feature_disable_remoting='yes' + mono_feature_disable_appdomains='yes' + + AOT_BUILD_FLAGS="--aot=hybrid,$INVARIANT_AOT_OPTIONS" + AOT_RUN_FLAGS="--hybrid-aot" else with_profile4_x_default=yes - with_monodroid_default=no - with_monotouch_default=no - with_monotouch_watch_default=no - with_monotouch_tv_default=no - with_bitcode_default=no - with_xammac_default=no - with_mobile_static_default=no - with_cooperative_gc_default=no fi if test "x$AOT_BUILD_FLAGS" != "x"; then : @@ -888,8 +907,11 @@ fi if test "x$with_xammac" = "xdefault"; then with_xammac=$with_xammac_default fi -if test "x$with_mobile_static" = "xdefault"; then - with_mobile_static=$with_mobile_static_default +if test "x$with_aot_hybrid" = "xdefault"; then + with_aot_hybrid=$with_aot_hybrid_default +fi +if test "x$with_aot_only" = "xdefault"; then + with_aot_only=$with_aot_only_default fi AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = "xyes"]) @@ -899,9 +921,11 @@ AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"] AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"]) AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes") AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"]) -AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"]) +AM_CONDITIONAL(INSTALL_AOT_HYBRID, [test "x$with_aot_hybrid" != "xno"]) +AM_CONDITIONAL(INSTALL_AOT_ONLY, [test "x$with_aot_only" != "xno"]) -AC_SUBST(INSTALL_MOBILE_STATIC) +AC_SUBST(INSTALL_AOT_HYBRID) +AC_SUBST(INSTALL_AOT_ONLY) default_profile=net_4_x if test -z "$INSTALL_MONODROID_TRUE"; then : @@ -913,8 +937,11 @@ fi if test -z "$INSTALL_XAMMAC_TRUE"; then : default_profile=xammac fi -if test -z "$INSTALL_MOBILE_STATIC_TRUE"; then : - default_profile=mobile_static +if test -z "$INSTALL_AOT_HYBRID_TRUE"; then : + default_profile=aot_hybrid +fi +if test -z "$INSTALL_AOT_ONLY_TRUE"; then : + default_profile=aot_only fi if test -z "$INSTALL_4_x_TRUE"; then : default_profile=net_4_x @@ -1162,20 +1189,6 @@ AC_COMPILE_IFELSE([ AC_MSG_RESULT(no) ]) -AC_MSG_CHECKING(for deprecated __attribute__) -AC_TRY_COMPILE([ - int doit (void) __attribute__ ((deprecated)); - int doit (void) { return 0; } -], [ - return 0; -], [ - have_deprecated=yes - AC_MSG_RESULT(yes) -], [ - have_deprecated=no - AC_MSG_RESULT(no) -]) - dnl dnl Boehm GC configuration dnl @@ -2672,12 +2685,6 @@ fi AC_ARG_ENABLE(bcl-opt, [ --disable-bcl-opt BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes) -AC_ARG_ENABLE(perf-events, [ --enable-perf-events Enable using `perf` for profiling on Linux], test_perf_events=$enableval, test_perf_events=no) -if test "x$test_perf_events" = "xyes"; then - AC_DEFINE(ENABLE_PERF_EVENTS, 1, [Enable using `perf` for profiling on Linux]) - AC_SUBST(ENABLE_PERF_EVENTS) -fi - AC_MSG_CHECKING([if big-arrays are to be enabled]) AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no) if test "x$enable_big_arrays" = "xyes" ; then @@ -3935,9 +3942,11 @@ dnl ************** dnl *** Btls *** dnl ************** -AC_ARG_ENABLE(btls, [ --disable-blts Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED) +AC_ARG_ENABLE(btls, [ --disable-btls Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED) AC_ARG_WITH(btls_android_ndk, [ --with-btls-android-ndk Android NDK for BoringTls]) +AC_ARG_ENABLE(dynamic-btls, [ --enable-dynamic-btls Place the BTLS provider into a separate shared library/archive.], enable_dynamic_btls=$enableval, enable_dynamic_btls=no) + AM_CONDITIONAL(BTLS, test x$enable_btls = xyes) btls_android=no @@ -3957,7 +3966,11 @@ if test "x$enable_btls" = "xyes"; then case "$BTLS_PLATFORM" in i386) btls_arch=i386 - btls_cflags="-m32 -arch i386" + btls_cflags="-m32" + case $host_os in + darwin*) + btls_cflags="$btls_cflags -arch i386" + esac ;; x86_64) btls_arch=x86_64 @@ -4063,10 +4076,13 @@ AC_SUBST(mono_build_root) 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 @@ -4075,6 +4091,8 @@ else 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]) @@ -4245,6 +4263,7 @@ llvm/Makefile scripts/mono-find-provides scripts/mono-find-requires mono/Makefile +mono/btls/Makefile mono/utils/Makefile mono/metadata/Makefile mono/dis/Makefile @@ -4405,11 +4424,24 @@ fi 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 fi + if test "x$enable_btls" = "xyes"; then + echo "HAVE_BTLS=1" >> $srcdir/$mcsdir/build/config.make + if test "x$enable_dynamic_btls" = "xyes"; then + echo "HAVE_DYNAMIC_BTLS=1" >> $srcdir/$mcsdir/build/config.make + fi + fi + fi ) @@ -4427,6 +4459,7 @@ fi echo " mcs source: $mcsdir + C# Compiler: $csc_compiler Engine: Host: $host @@ -4446,7 +4479,8 @@ echo " Xamarin.WatchOS: $with_monotouch_watch Xamarin.TVOS: $with_monotouch_tv Xamarin.Mac: $with_xammac - mobile_static: $with_mobile_static + AOT preferred: $with_aot_hybrid + AOT only: $with_aot_only JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg zlib: $zlib_msg