From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 28 Aug 2010 10:22:36 +0000 (+0200)
Subject: Fix response file test for unreliable exit status of IRIX ar.
X-Git-Tag: v2.4~73^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f9878d026d0c251d57b3b8e0bf5891691ac3f96;p=thirdparty%2Flibtool.git

Fix response file test for unreliable exit status of IRIX ar.

* libltdl/m4/libtool.m4 (_LT_PROG_AR): IRIX ar will not fail
over a command-line argument specifying a nonexistent file (such
as `@FILE'), so ensure failure with a reponse file containing
a nonexistent file.  Also, use lt_* variable prefix for
temporary variables.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 8e07775e5..4b77602ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix response file test for unreliable exit status of IRIX ar.
+	* libltdl/m4/libtool.m4 (_LT_PROG_AR): IRIX ar will not fail
+	over a command-line argument specifying a nonexistent file (such
+	as `@FILE'), so ensure failure with a reponse file containing
+	a nonexistent file.  Also, use lt_* variable prefix for
+	temporary variables.
+
 	Fix AC_LANG_PROGRAM warnings from git Autoconf.
 	* libltdl/m4/libtool.m4 (_LT_SYS_MODULE_PATH_AIX): Fix
 	underquoted AC_LANG_PROGRAM call.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index efb20de29..305e2d84c 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1359,10 +1359,15 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
   [lt_cv_ar_at_file=no
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
      [echo conftest.$ac_objext > conftest.lst
-      am_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst'
-      AC_TRY_EVAL([am_ar_try])
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst'
+      AC_TRY_EVAL([lt_ar_try])
       if test "$ac_status" -eq 0; then
-        lt_cv_ar_at_file=@
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
       fi
       rm -f conftest.* libconftest.a
      ])