From 6bb15c344d568fea2a56ff2288ddd44ef1735565 Mon Sep 17 00:00:00 2001 From: Richard Frith-Macdonald Date: Thu, 16 Apr 2020 09:39:35 +0100 Subject: [PATCH] Fix use of OBJC_RUNTIME_LIB before it was initialised. Thanks to johannes@brakensiek.info for spotting this. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bd23b27e5..36a45d1b0 100755 --- a/configure +++ b/configure @@ -2727,6 +2727,7 @@ fi if test -z "$LIBRARY_COMBO"; then LIBRARY_COMBO=`gnustep-config --variable=LIBRARY_COMBO 2>&5` fi +OBJC_RUNTIME_LIB=`echo $LIBRARY_COMBO | tr '-' ' ' | awk '{print $1}'` if test "$OBJC_RUNTIME_LIB" = "ng" -o "$OBJC_RUNTIME_LIB" = "apple"; then nonfragile=yes @@ -6003,7 +6004,6 @@ esac #-------------------------------------------------------------------- # Set Apple/Darwin/OSX/NeXT information for other tests #-------------------------------------------------------------------- -OBJC_RUNTIME_LIB=`echo $LIBRARY_COMBO | tr '-' ' ' | awk '{print $1}'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Objective-C runtime" >&5 $as_echo_n "checking the Objective-C runtime... " >&6; } if test "$OBJC_RUNTIME_LIB" = "nx" -o "$OBJC_RUNTIME_LIB" = "apple"; then diff --git a/configure.ac b/configure.ac index d597f5cbd..6fb0d1d6e 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,7 @@ fi if test -z "$LIBRARY_COMBO"; then LIBRARY_COMBO=`gnustep-config --variable=LIBRARY_COMBO 2>&5` fi +OBJC_RUNTIME_LIB=`echo $LIBRARY_COMBO | tr '-' ' ' | awk '{print $1}'` if test "$OBJC_RUNTIME_LIB" = "ng" -o "$OBJC_RUNTIME_LIB" = "apple"; then nonfragile=yes @@ -1254,7 +1255,6 @@ esac #-------------------------------------------------------------------- # Set Apple/Darwin/OSX/NeXT information for other tests #-------------------------------------------------------------------- -OBJC_RUNTIME_LIB=`echo $LIBRARY_COMBO | tr '-' ' ' | awk '{print $1}'` AC_MSG_CHECKING(the Objective-C runtime) if test "$OBJC_RUNTIME_LIB" = "nx" -o "$OBJC_RUNTIME_LIB" = "apple"; then AC_MSG_RESULT(NeXT)