diff options
| author | Tanzinul Islam <tanzinul.islam@gmail.com> | 2020-11-07 20:49:47 +0000 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-04-19 11:05:54 +0200 |
| commit | e15eff3aaabe17be37ec42ae7ca342cbf2a2733c (patch) | |
| tree | 26f06c11fe96cd13928a33499c6fb5193bf4c00d /Configurations | |
| parent | 118faf5ffe2ba495407f482a8d8438b7d266815c (diff) | |
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 1 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
2 files changed, 2 insertions, 1 deletions
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 |