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)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index f65fd30e5d24cba490c8f235c1f498dfb16bf02c..518e8c77f4d89b41aaad46a33987757160dc4fd7 100644 (file)
--- 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 b8ecfdc7d34defde34770e2ace4209772e3bfa1a..7643f6b5107fb0fb5bb471959aae1f05fe38cce0 100644 (file)
--- 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 c7e6dfc85098b29a159f343a5b54978672ec17b3..bf214b0ee20a0778401962ea4a9ab67fac655aa3 100644 (file)
--- 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