From: Richard Levitte <levitte@openssl.org>
Date: Thu, 8 Nov 2018 09:28:33 +0000 (+0100)
Subject: VMS build: don't add a comma before 'extradefines'
X-Git-Tag: openssl-3.0.0-alpha1~2926
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c5f2ea677ac1ebe87690d8febd2c7e4629c4841;p=oweals%2Fopenssl.git

VMS build: don't add a comma before 'extradefines'

The variable extradefines will have the starting comma, if needed.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7591)
---

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index eb0f9c50ae..04c0089434 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -198,9 +198,9 @@ ASOUTFLAG={- $target{asoutflag} -}$(OSSL_EMPTY)
 
 CNF_ASFLAGS={- join('', $target{asflags} || (),
                         @{$config{asflags}}) -}
-CNF_DEFINES={- our $defines2 = join('', map { ",$_" } @{$target{defines}},
-                                                      @{$config{defines}},
-                                                      "'extradefines'") -}
+CNF_DEFINES={- our $defines2 = join('', (map { ",$_" } @{$target{defines}},
+                                                       @{$config{defines}}),
+                                        "'extradefines'") -}
 CNF_INCLUDES={- our $includes2 = join(',', @{$target{includes}},
                                            @{$config{includes}}) -}
 CNF_CPPFLAGS={- our $cppflags2 = join('', $target{cppflags} || (),