From e15eff3aaabe17be37ec42ae7ca342cbf2a2733c Mon Sep 17 00:00:00 2001 From: Tanzinul Islam Date: Sat, 7 Nov 2020 20:49:47 +0000 Subject: [PATCH] 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 Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/13540) --- Configurations/10-main.conf | 1 + Configurations/windows-makefile.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index f8509feb39..fbab220360 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 b6fd9149c0..5d1d77b3d2 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 -- 2.34.1