mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Detect native ObjC exception support in the compiler, and turn it on if there
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@19551 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
68599a7c06
commit
9ae06b0ad8
5 changed files with 101 additions and 5 deletions
|
|
@ -1,3 +1,12 @@
|
|||
Fri Jun 18 18:49:16 2004 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac: Detect native exception handler support in the
|
||||
compiler, and set HAS_OBJC_EXCEPTIONS to yes if it's there.
|
||||
* configure: Regenerated.
|
||||
* config.make.in: New variable HAS_OBJC_EXCEPTIONS.
|
||||
* common.make: If HAS_OBJC_EXCEPTIONS is set, add
|
||||
-fobjc-exceptions to the ObjC flags.
|
||||
|
||||
2004-06-16 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* GNUmakefile (distclean): Remove duplicate GNUmakefile removal
|
||||
|
|
|
|||
|
|
@ -401,6 +401,11 @@ OBJCFLAGS = -fno-strict-aliasing
|
|||
CFLAGS =
|
||||
OBJ_DIR_PREFIX =
|
||||
|
||||
# If the compiler supports native ObjC exceptions, turn them on!
|
||||
ifeq ($(HAS_OBJC_EXCEPTIONS), yes)
|
||||
OBJCFLAGS += -fobjc-exceptions
|
||||
endif
|
||||
|
||||
#
|
||||
# Now decide whether to build shared objects or not. Nothing depending
|
||||
# on the value of the shared variable is allowed before this point!
|
||||
|
|
|
|||
|
|
@ -121,3 +121,9 @@ CONFIG_SYSTEM_LIB_DIR = @LIB_DIR@
|
|||
# used to compile them) via -MMD -MP flags
|
||||
#
|
||||
AUTO_DEPENDENCIES = @AUTO_DEPENDENCIES@
|
||||
|
||||
#
|
||||
# Whether the ObjC compiler supports native ObjC exceptions via
|
||||
# @try/@catch/@finally/@throw.
|
||||
#
|
||||
HAS_OBJC_EXCEPTIONS = @HAS_OBJC_EXCEPTIONS@
|
||||
57
configure
vendored
57
configure
vendored
|
|
@ -317,7 +317,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_type CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT root_prefix MAKEFILES_SUFFIX HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_type CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT root_prefix MAKEFILES_SUFFIX HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded HAS_OBJC_EXCEPTIONS AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -4520,8 +4520,6 @@ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
LIBS="$saved_LIBS"
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
if test x"$objc_threaded" = x""; then
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
|
@ -4536,6 +4534,58 @@ ac_cv_objc_threaded="$objc_threaded"
|
|||
|
||||
|
||||
|
||||
# Do not restore LIBS and CFLAGS yet as we need to test if the
|
||||
# compiler supports native exceptions.
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check if GCC supports -fobjc-exceptions, and if so, turn it on!
|
||||
#--------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking if the compiler supports native ObjC exceptions" >&5
|
||||
echo $ECHO_N "checking if the compiler supports native ObjC exceptions... $ECHO_C" >&6
|
||||
|
||||
# What we want to do: set HAS_OBJC_EXCEPTIONS to yes if we can compile
|
||||
# something with @try/@catch/@finally in it.
|
||||
|
||||
if test ! ${GCC} = "yes" ; then
|
||||
HAS_OBJC_EXCEPTIONS=""
|
||||
echo "$as_me:$LINENO: result: no: it's not gcc" >&5
|
||||
echo "${ECHO_T}no: it's not gcc" >&6
|
||||
else
|
||||
CFLAGS="$CFLAGS -fobjc-exceptions"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
int main() {@try{; } @finally{; }; return 0;}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
HAS_OBJC_EXCEPTIONS=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
HAS_OBJC_EXCEPTIONS=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $HAS_OBJC_EXCEPTIONS" >&5
|
||||
echo "${ECHO_T}$HAS_OBJC_EXCEPTIONS" >&6
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Restore LIBS and CFLAGS - we are going to compile C code in the next
|
||||
# test.
|
||||
LIBS="$saved_LIBS"
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check if compiler supports -MMD -MP to generate %.d files ...
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -5343,6 +5393,7 @@ s,@BACKEND_BUNDLE@,$BACKEND_BUNDLE,;t t
|
|||
s,@EGREP@,$EGREP,;t t
|
||||
s,@objc_threaded@,$objc_threaded,;t t
|
||||
s,@ac_cv_objc_threaded@,$ac_cv_objc_threaded,;t t
|
||||
s,@HAS_OBJC_EXCEPTIONS@,$HAS_OBJC_EXCEPTIONS,;t t
|
||||
s,@AUTO_DEPENDENCIES@,$AUTO_DEPENDENCIES,;t t
|
||||
s,@INCLUDES@,$INCLUDES,;t t
|
||||
s,@LIB_DIR@,$LIB_DIR,;t t
|
||||
|
|
|
|||
29
configure.ac
29
configure.ac
|
|
@ -464,8 +464,6 @@ else
|
|||
objc_threaded="", objc_threaded="")
|
||||
fi
|
||||
fi
|
||||
LIBS="$saved_LIBS"
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
if test x"$objc_threaded" = x""; then
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
|
|
@ -478,6 +476,33 @@ ac_cv_objc_threaded="$objc_threaded"
|
|||
AC_SUBST(objc_threaded)
|
||||
AC_SUBST(ac_cv_objc_threaded)
|
||||
|
||||
# Do not restore LIBS and CFLAGS yet as we need to test if the
|
||||
# compiler supports native exceptions.
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check if GCC supports -fobjc-exceptions, and if so, turn it on!
|
||||
#--------------------------------------------------------------------
|
||||
AC_MSG_CHECKING(if the compiler supports native ObjC exceptions)
|
||||
|
||||
# What we want to do: set HAS_OBJC_EXCEPTIONS to yes if we can compile
|
||||
# something with @try/@catch/@finally in it.
|
||||
|
||||
if test ! ${GCC} = "yes" ; then
|
||||
HAS_OBJC_EXCEPTIONS=""
|
||||
AC_MSG_RESULT(no: it's not gcc)
|
||||
else
|
||||
CFLAGS="$CFLAGS -fobjc-exceptions"
|
||||
AC_COMPILE_IFELSE([[int main() {@try{; } @finally{; }; return 0;}]], HAS_OBJC_EXCEPTIONS=yes, HAS_OBJC_EXCEPTIONS=no)
|
||||
AC_MSG_RESULT($HAS_OBJC_EXCEPTIONS)
|
||||
fi
|
||||
|
||||
AC_SUBST(HAS_OBJC_EXCEPTIONS)
|
||||
|
||||
# Restore LIBS and CFLAGS - we are going to compile C code in the next
|
||||
# test.
|
||||
LIBS="$saved_LIBS"
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check if compiler supports -MMD -MP to generate %.d files ...
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue