From: Tanzinul Islam <tanzinul.islam@gmail.com>
Date: Sat, 7 Nov 2020 20:49:47 +0000 (+0000)
Subject: Generalize delimiter in archiver response file
X-Git-Tag: openssl-3.0.0-alpha15~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e15eff3aaabe17be37ec42ae7ca342cbf2a2733c;p=thirdparty%2Fopenssl.git

Generalize delimiter in archiver response file

While [`lib.exe` of MSVC][1] expects newline-delimited response file
lines, [`tlib.exe` of C++Builder][2] expects lines to end with `&` in
order to read the next line.

[1]: https://docs.microsoft.com/cpp/build/reference/running-lib?view=msvc-160#lib-command-files
[2]: http://docwiki.embarcadero.com/RADStudio/Sydney/en/TLIB.EXE,_the_Library_Manager#Response_Files

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index f8509feb39c..fbab2203604 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1284,6 +1284,7 @@ my %targets = (
         AR               => "lib",
         ARFLAGS          => "/nologo",
         aroutflag        => "/out:",
+        ar_resp_delim    => "\n",
         defines          => add("OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN",
                                 "UNICODE", "_UNICODE",
                                 "_CRT_SECURE_NO_DEPRECATE",
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index b6fd9149c0b..5d1d77b3d24 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -909,7 +909,7 @@ EOF
      my %args = @_;
      my $lib = platform->staticlib($args{lib});
      my @objs = map { platform->obj($_) } @{$args{objs}};
-     my $objs = join("\n", @objs);
+     my $objs = join($target{ar_resp_delim}, @objs);
      my $deps = join(" ", @objs);
      return <<"EOF";
 $lib: $deps