gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 17:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add some checks that the runtime supports features we need for ng

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39443 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2016-03-02 14:42:43 +00:00
parent ca7d5e2b9f
commit ccba19b756
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure vendored
View file

@ -7910,6 +7910,9 @@ if test $ac_cv_func_objc_sync_enter = yes ; then
OBJCSYNC=1
else
OBJCSYNC=0
if test "$OBJC_RUNTIME_LIB" = "ng"; then
as_fn_error $? "The objc runtime library does not appear to have synchronisation support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a -L point to specify the directory containing the correct libobjc, or using the --with-objc-lib-flag=... option." "$LINENO" 5
fi
fi
@ -7938,6 +7941,9 @@ done
OBJC2RUNTIME=1
else
OBJC2RUNTIME=0
if test "$OBJC_RUNTIME_LIB" = "ng"; then
as_fn_error $? "The objc runtime library does not appear to have property support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a -L point to specify the directory containing the correct libobjc, or using the --with-objc-lib-flag=... option." "$LINENO" 5
fi
fi
fi
@ -7960,6 +7966,9 @@ if test $ac_cv_func__Block_copy = yes ; then
HAVE_BLOCKS=1
else
HAVE_BLOCKS=0
if test "$OBJC_RUNTIME_LIB" = "ng"; then
as_fn_error $? "The objc runtime library does not appear to have blocks support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a -L point to specify the directory containing the correct libobjc, or using the --with-objc-lib-flag=... option." "$LINENO" 5
fi
fi
@ -7992,15 +8001,17 @@ fi
if test $non_fragile = yes; then
OBJCLIBS="$OBJLIBS -fobjc-nonfragile-abi"
GS_NONFRAGILE=1
# Check whether --enable-mixedabi was given.
if test "$OBJC_RUNTIME_LIB" != "ng"; then
# Check whether --enable-mixedabi was given.
if test "${enable_mixedabi+set}" = set; then :
enableval=$enable_mixedabi;
else
enable_mixedabi=yes
fi
if test $enable_mixedabi = yes; then
GS_MIXEDABI=1
if test $enable_mixedabi = yes; then
GS_MIXEDABI=1
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $non_fragile" >&5

21
configure.ac
View file

@ -1955,6 +1955,9 @@ if test $ac_cv_func_objc_sync_enter = yes ; then
OBJCSYNC=1
else
OBJCSYNC=0
if test "$OBJC_RUNTIME_LIB" = "ng"; then
AC_MSG_ERROR([The objc runtime library does not appear to have synchronisation support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a -L point to specify the directory containing the correct libobjc, or using the --with-objc-lib-flag=... option.])
fi
fi
AC_SUBST(OBJCSYNC)
@ -1972,6 +1975,9 @@ else
OBJC2RUNTIME=1
else
OBJC2RUNTIME=0
if test "$OBJC_RUNTIME_LIB" = "ng"; then
AC_MSG_ERROR([The objc runtime library does not appear to have property support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a -L point to specify the directory containing the correct libobjc, or using the --with-objc-lib-flag=... option.])
fi
fi
fi
AC_SUBST(OBJC2RUNTIME)
@ -1984,6 +1990,9 @@ if test $ac_cv_func__Block_copy = yes ; then
HAVE_BLOCKS=1
else
HAVE_BLOCKS=0
if test "$OBJC_RUNTIME_LIB" = "ng"; then
AC_MSG_ERROR([The objc runtime library does not appear to have blocks support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a -L point to specify the directory containing the correct libobjc, or using the --with-objc-lib-flag=... option.])
fi
fi
AC_SUBST(HAVE_BLOCKS)
@ -2003,13 +2012,15 @@ if test "$nonfragile" = "yes"; then
if test $non_fragile = yes; then
OBJCLIBS="$OBJLIBS -fobjc-nonfragile-abi"
GS_NONFRAGILE=1
AC_ARG_ENABLE(mixedabi,
[ --disable-mixedabi
if test "$OBJC_RUNTIME_LIB" != "ng"; then
AC_ARG_ENABLE(mixedabi,
[ --disable-mixedabi
Disables the combined use of fragile and nonfragile ABI so that base
can be built taking full advantage of the nonfragile ABI.],,
enable_mixedabi=yes)
if test $enable_mixedabi = yes; then
GS_MIXEDABI=1
enable_mixedabi=yes)
if test $enable_mixedabi = yes; then
GS_MIXEDABI=1
fi
fi
fi
AC_MSG_RESULT($non_fragile)