gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix previous change, which had broken the autoconf tests for Objective

Browse source 
C++, the fragile API and native exception support, by using the
correct autoconf macros.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@38898 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2015-08-17 12:48:41 +00:00
parent 4a420f7278
commit 9a7d1681d0
3 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2015-08-17 Wolfgang Lux <wolfgang.lux@gmail.com>
* configure.ac: Fix the previous change, which had broken the tests
for Objective C++, the fragile API and native exception support,
by using the correct autoconf macros.
* configure: Regenerated.
2015-08-16 Richard Frith-Macdonald <rfm@gnu.org>
* library-combo.make: Use David's suggested runtime flag for the

21
configure vendored
View file

@ -5901,10 +5901,6 @@ CXXPPFLAGS="$CXXPPFLAGS -x objective-c++"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
@interface ObjCClass
{
@ -5923,9 +5919,6 @@ main()
return 0;
}
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
objcc=yes
@ -5975,10 +5968,6 @@ if test x"$USE_NONFRAGILE_ABI" = x"yes"; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
/* Note that we never execute this code so it does not really matter
what it is. We are testing that the compiler accepts the
'-fobjc-nonfragile-abi' flag. */
@ -5991,9 +5980,6 @@ main()
return __has_feature(objc_nonfragile_abi) ? 0 : 1;
}
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
USE_NONFRAGILE_ABI=yes
@ -6161,10 +6147,6 @@ if test x"$USE_OBJC_EXCEPTIONS" = x"maybe"; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
#include <objc/objc.h>
@interface Test { id isa; } @end
@ -6182,9 +6164,6 @@ int test (Test *o)
return 0;
}
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
USE_OBJC_EXCEPTIONS=yes

12
configure.ac
View file

@ -1369,7 +1369,7 @@ CXXFLAGS="$CXXFLAGS -x objective-c++"
CXXPPFLAGS_saved="$CXXPPFLAGS"
CXXPPFLAGS="$CXXPPFLAGS -x objective-c++"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
@interface ObjCClass
{
@ -1387,7 +1387,7 @@ main()
{
return 0;
}
])], objcc=yes, objcc=no)
]])], objcc=yes, objcc=no)
AC_MSG_RESULT($objcc)
if test x"$objcc" = x"no"; then
OBJCXX=
@ -1420,7 +1420,7 @@ if test x"$USE_NONFRAGILE_ABI" = x"yes"; then
# something with -fobjc-nonfragile-abi.
CFLAGS_no_nonfragile="$CFLAGS"
CFLAGS="$CFLAGS -fobjc-nonfragile-abi"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
/* Note that we never execute this code so it does not really matter
what it is. We are testing that the compiler accepts the
'-fobjc-nonfragile-abi' flag. */
@ -1432,7 +1432,7 @@ main()
#endif
return __has_feature(objc_nonfragile_abi) ? 0 : 1;
}
])], USE_NONFRAGILE_ABI=yes, USE_NONFRAGILE_ABI=no)
]])], USE_NONFRAGILE_ABI=yes, USE_NONFRAGILE_ABI=no)
AC_MSG_RESULT($USE_NONFRAGILE_ABI)
CFLAGS="$CFLAGS_no_nonfragile"
@ -1569,7 +1569,7 @@ if test x"$USE_OBJC_EXCEPTIONS" = x"maybe"; then
# something with @try/@catch/@finally in it.
CFLAGS_no_exceptions="$CFLAGS"
CFLAGS="$CFLAGS -fexceptions -fobjc-exceptions"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <objc/objc.h>
@interface Test { id isa; } @end
@ -1586,7 +1586,7 @@ int test (Test *o)
}
return 0;
}
])], USE_OBJC_EXCEPTIONS=yes, USE_OBJC_EXCEPTIONS=no)
]])], USE_OBJC_EXCEPTIONS=yes, USE_OBJC_EXCEPTIONS=no)
if test x"$USE_OBJC_EXCEPTIONS" = x"no"; then
AC_MSG_RESULT(no)
else