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
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"
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"
need_link_unlink=yes
with_sigaltstack=no
use_sigposix=yes
+ with_sgen_default_concurrent=yes
;;
*-*-*freebsd*)
if test "x$PTHREAD_CFLAGS" = "x"; then
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"
libgc_threads=pthreads
with_sigaltstack=no
use_sigposix=yes
+ with_sgen_default_concurrent=yes
;;
*-*-linux-android*)
platform_android=yes
disable_munmap=yes
;;
esac
+ with_sgen_default_concurrent=yes
;;
*-*-nacl*)
CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
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
# 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
# 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
# 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(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(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(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_hybrid,mobile_static,bitcode_mobile_static Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
dnl
dnl Profile defaults
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_mobile_static_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
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
mono_feature_disable_com='yes'
AOT_RUN_FLAGS="--full-aot"
elif test x$with_runtime_preset = xbitcode_mobile_static; 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_bitcode_default=yes
with_cooperative_gc_default=yes
AOT_BUILD_FLAGS="--aot=llvmonly,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--llvmonly"
+elif test x$with_runtime_preset = xhybrid; 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 :
if test "x$with_xammac" = "xdefault"; then
with_xammac=$with_xammac_default
fi
+if test "x$with_aot_hybrid" = "xdefault"; then
+ with_aot_hybrid=$with_aot_hybrid_default
+fi
if test "x$with_mobile_static" = "xdefault"; then
with_mobile_static=$with_mobile_static_default
fi
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_AOT_HYBRID, [test "x$with_aot_hybrid" != "xno"])
AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"])
+AC_SUBST(INSTALL_AOT_HYBRID)
AC_SUBST(INSTALL_MOBILE_STATIC)
default_profile=net_4_x
if test -z "$INSTALL_XAMMAC_TRUE"; then :
default_profile=xammac
fi
+if test -z "$INSTALL_AOT_HYBRID_TRUE"; then :
+ default_profile=aot_hybrid
+fi
if test -z "$INSTALL_MOBILE_STATIC_TRUE"; then :
default_profile=mobile_static
fi
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
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
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
)
Xamarin.WatchOS: $with_monotouch_watch
Xamarin.TVOS: $with_monotouch_tv
Xamarin.Mac: $with_xammac
+ aot_hybrid: $with_aot_hybrid
mobile_static: $with_mobile_static
JNI support: $jdk_headers_found
libgdiplus: $libgdiplus_msg
projects / mono.git / blobdiff