mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-01 05:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace "ld_wildcard_args" with "bin_lflags"

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)
This commit is contained in:
Tanzinul Islam 2020-11-28 02:11:28 +00:00 committed by Dmitry Belyavskiy
parent 847f41d97c
commit d5a6b54b49
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/10-main.conf
View File

@ -1283,7 +1283,7 @@ my %targets = (
ldoutflag => "/out:", ldoutflag => "/out:",
ldpostoutflag => "", ldpostoutflag => "",
ld_resp_delim => "\n", ld_resp_delim => "\n",
ld_wildcard_args => "setargv.obj", bin_lflags => "setargv.obj",
AR => "lib", AR => "lib",
ARFLAGS => "/nologo", ARFLAGS => "/nologo",
aroutflag => "/out:", aroutflag => "/out:",

12
Configurations/50-cppbuilder.conf
View File

@ -15,15 +15,15 @@ my %targets = (
release => "-O2"), release => "-O2"),
coutflag => "-o", coutflag => "-o",
LD => "ilink32", LD => "ilink32",
lflags => picker(default => "-ap -Tpe -x -Gn -q", bin_lflags => combine(picker(default => "-ap -Tpe -x -Gn -q",
debug => '-j"$(BDS)\lib\win32c\debug" ' . debug => '-j"$(BDS)\lib\win32c\debug" ' .
'-L"$(BDS)\lib\win32c\debug"', '-L"$(BDS)\lib\win32c\debug"',
release => '-j"$(BDS)\lib\win32c\release" ' . release => '-j"$(BDS)\lib\win32c\release" ' .
'-L"$(BDS)\lib\win32c\release"'), '-L"$(BDS)\lib\win32c\release"'),
"wildargs.obj"),
ldoutflag => ",", ldoutflag => ",",
ldpostoutflag => ",,", ldpostoutflag => ",,",
ld_resp_delim => " +\n", ld_resp_delim => " +\n",
ld_wildcard_args => "wildargs.obj",
ex_libs => add(sub { ex_libs => add(sub {
my @ex_libs = (); my @ex_libs = ();
push @ex_libs, ("cw32mt.lib", "import32.lib", "crypt32.lib", push @ex_libs, ("cw32mt.lib", "import32.lib", "crypt32.lib",

2
Configurations/windows-makefile.tmpl
View File

@ -936,7 +936,7 @@ EOF
$bin: $deps $bin: $deps
IF EXIST $bin.manifest DEL /F /Q $bin.manifest IF EXIST $bin.manifest DEL /F /Q $bin.manifest
\$(LD) \$(LDFLAGS) \$(BIN_LDFLAGS) @<< \$(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 \\ IF EXIST $bin.manifest \\
\$(MT) \$(MTFLAGS) \$(MTINFLAG)$bin.manifest \$(MTOUTFLAG)$bin \$(MT) \$(MTFLAGS) \$(MTINFLAG)$bin.manifest \$(MTOUTFLAG)$bin