From 2e388a18a196abef4e846517a686d436e614cd12 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Sun, 25 Aug 2019 13:47:13 -0400
Subject: [PATCH] * tests/scripts/features/archives: [SV 54395] Support non-GNU
ar.
---
tests/scripts/features/archives | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
index 5662de42..87a50079 100644
--- a/tests/scripts/features/archives
+++ b/tests/scripts/features/archives
@@ -218,7 +218,9 @@ if ($osname eq 'VMS') {
if ($osname ne 'VMS') {
my $pre = '1234567890123456';
- my $lib = 'foo.a';
+ my $lib = 'libxx.a';
+ my $cr = $created;
+ $cr =~ s#a1\.o#${pre}a#;
run_make_test(qq!
# Both member names > 16 characters long
@@ -228,7 +230,7 @@ default: $lib(${pre}a) $lib(${pre}b)
$pre%: ; touch \$\@
!,
- $arvar, "touch ${pre}a\n$ar $arflags $lib ${pre}a\n$ar: creating $lib\na - ${pre}a\ntouch ${pre}b\n$ar $arflags $lib ${pre}b\na - ${pre}b\nrm ${pre}a ${pre}b\n");
+ $arvar, "touch ${pre}a\n$ar $arflags $lib ${pre}a\n${cr}touch ${pre}b\n$ar $arflags $lib ${pre}b\na - ${pre}b\nrm ${pre}a ${pre}b\n");
# Run it again; nothing should happen
run_make_test(undef, $arvar, "#MAKE#: Nothing to be done for 'default'.\n");