projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3540 from kumpera/abort-on-gerror
[mono.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 69ba58376c39e4c70ceaa684b96dc0e61d1bd09b..21db9420c474e44b3e974d7e4b150795ea41094e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,7
+2,7
@@
#AC_PREREQ([2.62])
# when bumping version number below, keep it in sync with man/mono.1 too
#AC_PREREQ([2.62])
# when bumping version number below, keep it in sync with man/mono.1 too
-AC_INIT(mono, [4.
5.2
],
+AC_INIT(mono, [4.
7.0
],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
@@
-532,6
+532,9
@@
if test x"$GCC" = xyes; then
# We rely on signed overflow to behave
CFLAGS="$CFLAGS -fwrapv"
# 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
CFLAGS="$CFLAGS -DMONO_DLL_EXPORT"
if test x"$disable_visibility_hidden" = xno; then
# Don't export any symbols by default
@@
-791,7
+794,7
@@
elif test x$with_runtime_preset = xall; then
with_monotouch_watch_default=yes
with_monotouch_tv_default=yes
with_xammac_default=yes
with_monotouch_watch_default=yes
with_monotouch_tv_default=yes
with_xammac_default=yes
- with_mobile_static_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_bitcode_default=no
elif test x$with_runtime_preset = xmobile_static; then
DISABLE_MCS_DOCS_default=yes
@@
-852,6
+855,8
@@
fi
if test "x$AOT_BUILD_FLAGS" != "x"; then :
AC_SUBST(AOT_BUILD_FLAGS)
AC_SUBST(AOT_RUN_FLAGS)
if test "x$AOT_BUILD_FLAGS" != "x"; then :
AC_SUBST(AOT_BUILD_FLAGS)
AC_SUBST(AOT_RUN_FLAGS)
+ # For llvmonlycheck + fullaotcheck
+ AC_SUBST(INVARIANT_AOT_OPTIONS)
fi
AC_SUBST(TEST_PROFILE)
fi
AC_SUBST(TEST_PROFILE)
@@
-892,8
+897,6
@@
AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"])
AC_SUBST(INSTALL_MOBILE_STATIC)
AC_SUBST(INSTALL_MOBILE_STATIC)
-AC_SUBST(BITCODE)
-
default_profile=net_4_x
if test -z "$INSTALL_MONODROID_TRUE"; then :
default_profile=monodroid
default_profile=net_4_x
if test -z "$INSTALL_MONODROID_TRUE"; then :
default_profile=monodroid
@@
-2853,13
+2856,12
@@
if test "x$enable_llvm" = "xyes"; then
LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
llvm_jit_supported=yes
llvm_jit_libs="jit mcjit $llvm_codegen"
LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
llvm_jit_supported=yes
llvm_jit_libs="jit mcjit $llvm_codegen"
- if test $llvm_api_version -gt 100; then
- # Based on llvm 3.9, only aot is currently supported
- llvm_jit_libs="orcjit $llvm_codegen"
- elif test "x$host" != "x$target"; then
+ if test "x$host" != "x$target"; then
# No need for jit libs
llvm_jit_supported=no
llvm_jit_libs=""
# No need for jit libs
llvm_jit_supported=no
llvm_jit_libs=""
+ elif test $llvm_api_version -gt 100; then
+ llvm_jit_libs="orcjit $llvm_codegen"
fi
LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter $llvm_jit_libs`
if test "x$LLVM_LIBS" = "x"; then
fi
LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter $llvm_jit_libs`
if test "x$LLVM_LIBS" = "x"; then