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

simplify runtime type detection

Browse source 
also add some documentation about why this is so complicated
This commit is contained in:
Niels Grewe 2019-12-23 07:13:23 +01:00
parent 02f47ebb01
commit 9b27e65659
No known key found for this signature in database
GPG key ID: 003E2A780EE52172
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
configure vendored
View file

@ -6699,12 +6699,10 @@ $as_echo "$gs_cv_libobjc_domain_ng" >&6; }
ac_fn_c_check_func "$LINENO" "objc_test_capability" "ac_cv_func_objc_test_capability"
ac_fn_c_check_func "$LINENO" "objc_test_capability" "ac_cv_func_objc_test_capability"
if test "x$ac_cv_func_objc_test_capability" = xyes; then :
fi
if test x"$ac_cv_func_objc_test_capability" = x"yes"; then
gs_cv_library_combo_from_existing_install=no
@ -6760,8 +6758,11 @@ $as_echo "$_gs_cv_libray_combo" >&6; }
LIBRARY_COMBO=ng-gnu-gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: library combo has been upgraded to \`ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly." >&5
$as_echo "$as_me: library combo has been upgraded to \`ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly." >&6;}
fi
OBJC_CPPFLAGS=$gs_cv_ng_rt_saved_OBJC_CPPFLAGS
fi
OBJC_CPPFLAGS=$gs_cv_ng_rt_saved_OBJC_CPPFLAGS
{ gs_cv_ng_rt_saved_OBJC_CPPFLAGS=; unset gs_cv_ng_rt_saved_OBJC_CPPFLAGS;}
OBJC_LDFLAGS=$gs_cv_ng_rt_saved_OBJC_LDFLAGS
{ gs_cv_ng_rt_saved_OBJC_LDFLAGS=; unset gs_cv_ng_rt_saved_OBJC_LDFLAGS;}

15
configure.ac
View file

@ -1070,6 +1070,11 @@ GS_OBJC_LIB_FLAG()
GS_LIBOBJC_PKG()
if test "$OBJC_RUNTIME_LIB" = "gnu" -a x"$gs_cv_cc_is_clang" = x"yes" -a x"$gs_cv_library_combo_implicit" = x"yes"; then
dnl in order to determine whether the installed runtime library supports the `ng' library combo,
dnl we need to detect the runtime with that combo specifically. Unfortunately,
dnl GS_CHECK_OBJC_RUNTIME is a very invasive macro that sets up lots of variables needed later on.
dnl For that reason, we need to save the state of all variables that are changed by this and
dnl restore them afterwards
m4_define([rt_save_variables], [[OBJC_CPPFLAGS],dnl
[OBJC_LDFLAGS],dnl
[OBJC_FINAL_LIB_FLAG],dnl
@ -1085,12 +1090,16 @@ if test "$OBJC_RUNTIME_LIB" = "gnu" -a x"$gs_cv_cc_is_clang" = x"yes" -a x"$gs_
AS_VAR_SET([m4_join([_], [gs_cv_ng_rt_saved], m4_strip(to_save))], m4_join([], [$], m4_strip(to_save)))
])dnl
GS_CHECK_OBJC_RUNTIME([NG], [ng-gnu-gnu])
AC_CHECK_FUNC([objc_test_capability])
if test x"$ac_cv_func_objc_test_capability" = x"yes"; then
dnl The gnustep runtime library has objc_test_capability -- the GCC runtime doesn't, so we can use this
dnl to distinguish between them
AC_CHECK_FUNC([objc_test_capability], [
GS_LIBRARY_COMBO([ng-gnu-gnu],[yes])
LIBRARY_COMBO=ng-gnu-gnu
AC_MSG_NOTICE([library combo has been upgraded to `ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly.])
fi
])
dnl restare state
m4_foreach([saved_var], [rt_save_variables], [dnl
AS_VAR_SET([m4_strip(saved_var)], m4_join([], [$gs_cv_ng_rt_saved_], m4_strip(saved_var)))
AS_UNSET(m4_join([_], [gs_cv_ng_rt_saved], m4_strip(saved_var)))