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

Check for objc.lib instead of objc.dll as that is what is used for linking.

Browse source
This commit is contained in:
Frederik Seiffert 2020-11-30 10:41:43 +01:00 committed by Frederik Seiffert
parent 528747eac1
commit 58d2d577f7
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
configure vendored
View file

@ -6580,8 +6580,8 @@ if test "$OBJC_RUNTIME_LIB" = "gnu" -a x"$gs_cv_cc_is_clang" = x"yes" -a x"$gs_
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.dll" >&5
$as_echo_n "checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.dll... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.lib" >&5
$as_echo_n "checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.lib... " >&6; }
if ${gs_cv_ng_libobjc_domains_ng_gnu_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
@ -6613,7 +6613,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu; then
if test -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/objc.dll" ; then
if test -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir_ng_gnu_gnu/objc.lib" ; then
gs_cv_ng_libobjc_domains_ng_gnu_gnu="${gs_cv_ng_libobjc_domains_ng_gnu_gnu}${INFIX}SYSTEM"
INFIX=", "
fi
@ -6644,7 +6644,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu; then
if test -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/objc.dll" ; then
if test -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_NETWORK_LIBRARIES_dir_ng_gnu_gnu/objc.lib" ; then
gs_cv_ng_libobjc_domains_ng_gnu_gnu="${gs_cv_ng_libobjc_domains_ng_gnu_gnu}${INFIX}NETWORK"
INFIX=", "
fi
@ -6675,7 +6675,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu; then
if test -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/objc.dll" ; then
if test -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_LOCAL_LIBRARIES_dir_ng_gnu_gnu/objc.lib" ; then
gs_cv_ng_libobjc_domains_ng_gnu_gnu="${gs_cv_ng_libobjc_domains_ng_gnu_gnu}${INFIX}LOCAL"
INFIX=", "
fi
@ -6706,7 +6706,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu; then
if test -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/objc.dll" ; then
if test -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc.a" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc.so" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc.dll.a" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/libobjc-gnu.dylib" -o -f "$gs_cv_USER_LIBRARIES_dir_ng_gnu_gnu/objc.lib" ; then
gs_cv_ng_libobjc_domains_ng_gnu_gnu="${gs_cv_ng_libobjc_domains_ng_gnu_gnu}${INFIX}USER"
INFIX=", "
fi
@ -7083,8 +7083,8 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.dll" >&5
$as_echo_n "checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.dll... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.lib" >&5
$as_echo_n "checking for domains containing libraries libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.lib... " >&6; }
if ${gs_cv_dflt_libobjc_domains+:} false; then :
$as_echo_n "(cached) " >&6
else
@ -7116,7 +7116,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_SYSTEM_LIBRARIES_dir; then
if test -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/objc.dll" ; then
if test -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_SYSTEM_LIBRARIES_dir/objc.lib" ; then
gs_cv_dflt_libobjc_domains="${gs_cv_dflt_libobjc_domains}${INFIX}SYSTEM"
INFIX=", "
fi
@ -7147,7 +7147,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_NETWORK_LIBRARIES_dir; then
if test -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/objc.dll" ; then
if test -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_NETWORK_LIBRARIES_dir/objc.lib" ; then
gs_cv_dflt_libobjc_domains="${gs_cv_dflt_libobjc_domains}${INFIX}NETWORK"
INFIX=", "
fi
@ -7178,7 +7178,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_LOCAL_LIBRARIES_dir; then
if test -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/objc.dll" ; then
if test -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_LOCAL_LIBRARIES_dir/objc.lib" ; then
gs_cv_dflt_libobjc_domains="${gs_cv_dflt_libobjc_domains}${INFIX}LOCAL"
INFIX=", "
fi
@ -7209,7 +7209,7 @@ fi
{ _LIBRARY_COMBO=; unset _LIBRARY_COMBO;}
if test -d $gs_cv_USER_LIBRARIES_dir; then
if test -f "$gs_cv_USER_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_USER_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_USER_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_USER_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_USER_LIBRARIES_dir/objc.dll" ; then
if test -f "$gs_cv_USER_LIBRARIES_dir/libobjc.a" -o -f "$gs_cv_USER_LIBRARIES_dir/libobjc.so" -o -f "$gs_cv_USER_LIBRARIES_dir/libobjc.dll.a" -o -f "$gs_cv_USER_LIBRARIES_dir/libobjc-gnu.dylib" -o -f "$gs_cv_USER_LIBRARIES_dir/objc.lib" ; then
gs_cv_dflt_libobjc_domains="${gs_cv_dflt_libobjc_domains}${INFIX}USER"
INFIX=", "
fi

2
m4/gs_objc_runtime.m4
View file

@ -90,7 +90,7 @@ AC_DEFUN([GS_CUSTOM_OBJC_RUNTIME_DOMAIN], [
m4_pushdef([LIBOBJC_DOMAINS], m4_join([_], LIBOBJC, [DOMAINS]))
m4_pushdef([OBJC_HEADERS_DOMAINS], m4_join([_], OBJC_HEADERS, [DOMAINS]))
m4_pushdef([gs_cv_libobjc_domain], m4_join([_], [gs_cv_libobjc_domain], m4_tolower($1)))
GS_DOMAINS_FOR_FILES([LIBOBJC], [LIBRARIES], [libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.dll], [$2])
GS_DOMAINS_FOR_FILES([LIBOBJC], [LIBRARIES], [libobjc.a, libobjc.so, libobjc.dll.a, libobjc-gnu.dylib, objc.lib], [$2])
GS_DOMAINS_FOR_FILES([OBJC_HEADERS], [HEADERS], [objc/objc.h], [$2])
AC_CACHE_CHECK([for custom shared objc library domain], [gs_cv_libobjc_domain], [
gs_cv_libobjc_domain=""