From fffb1c5496e47dacc8245bd140f6955a31c5ea6f Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 28 Mar 2018 10:07:32 +0200 Subject: [PATCH] Configurations/10-main.conf: fix VC-noCE-common template. picker() is type agnostic, but its output consumer is not. Or rather it doesn't work if picker() picks nothing when consumer expects array. So ensure array is returned when array is expected. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/5770) --- Configurations/10-main.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 0f7bdf2687..03a53d3bf4 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1285,7 +1285,8 @@ my %targets = ( sub { ($disabled{shared} ? "" : "/MD"); })), - defines => add(picker(debug => [ "DEBUG", "_DEBUG" ])), + defines => add(picker(default => [], # works as type cast + debug => [ "DEBUG", "_DEBUG" ])), lib_cflags => add(sub { $disabled{shared} ? "/MT /Zl" : () }), # Following might/should appears controversial, i.e. defining # /MDd without evaluating $disabled{shared}. It works in -- 2.25.1