diff options
| author | Tanzinul Islam <tanzinul.islam@gmail.com> | 2020-11-28 02:11:28 +0000 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-04-19 11:05:54 +0200 |
| commit | d5a6b54b49905cdb4edfe1e1caf9656896171cb6 (patch) | |
| tree | 78b54ca0f6dd8a6683810d74795bccc2456966b9 /Configurations | |
| parent | 847f41d97c966707d45da5640792e3bd8f8d23fd (diff) | |
Replace "ld_wildcard_args" with "bin_lflags"
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 | 2 | ||||
| -rw-r--r-- | Configurations/50-cppbuilder.conf | 12 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index f65fd30e5d..518e8c77f4 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1283,7 +1283,7 @@ my %targets = ( ldoutflag => "/out:", ldpostoutflag => "", ld_resp_delim => "\n", - ld_wildcard_args => "setargv.obj", + bin_lflags => "setargv.obj", AR => "lib", ARFLAGS => "/nologo", aroutflag => "/out:", diff --git a/Configurations/50-cppbuilder.conf b/Configurations/50-cppbuilder.conf index b8ecfdc7d3..7643f6b510 100644 --- a/Configurations/50-cppbuilder.conf +++ b/Configurations/50-cppbuilder.conf @@ -15,15 +15,15 @@ my %targets = ( release => "-O2"), coutflag => "-o", LD => "ilink32", - lflags => picker(default => "-ap -Tpe -x -Gn -q", - debug => '-j"$(BDS)\lib\win32c\debug" ' . - '-L"$(BDS)\lib\win32c\debug"', - release => '-j"$(BDS)\lib\win32c\release" ' . - '-L"$(BDS)\lib\win32c\release"'), + bin_lflags => combine(picker(default => "-ap -Tpe -x -Gn -q", + debug => '-j"$(BDS)\lib\win32c\debug" ' . + '-L"$(BDS)\lib\win32c\debug"', + release => '-j"$(BDS)\lib\win32c\release" ' . + '-L"$(BDS)\lib\win32c\release"'), + "wildargs.obj"), ldoutflag => ",", ldpostoutflag => ",,", ld_resp_delim => " +\n", - ld_wildcard_args => "wildargs.obj", ex_libs => add(sub { my @ex_libs = (); push @ex_libs, ("cw32mt.lib", "import32.lib", "crypt32.lib", diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index c7e6dfc850..bf214b0ee2 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -936,7 +936,7 @@ EOF $bin: $deps IF EXIST $bin.manifest DEL /F /Q $bin.manifest \$(LD) \$(LDFLAGS) \$(BIN_LDFLAGS) @<< -$objs$target{ld_resp_delim}$target{ld_wildcard_args}$target{ld_resp_delim}\$(LDOUTFLAG)$bin$target{ldpostoutflag}$target{ld_resp_delim}$linklibs\$(BIN_EX_LIBS) +$objs$target{ld_resp_delim}\$(LDOUTFLAG)$bin$target{ldpostoutflag}$target{ld_resp_delim}$linklibs\$(BIN_EX_LIBS) << IF EXIST $bin.manifest \\ \$(MT) \$(MTFLAGS) \$(MTINFLAG)$bin.manifest \$(MTOUTFLAG)$bin |