[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9c5f2ea677ac1ebe87690d8febd2c7e4629c4841 (commit)
      from  8cfc19716c22dac737ec8cfc5f7d085e7c37f4d8 (commit)


- Log -----------------------------------------------------------------
commit 9c5f2ea677ac1ebe87690d8febd2c7e4629c4841
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 8 10:28:33 2018 +0100

    VMS build: don't add a comma before 'extradefines'
    
    The variable extradefines will have the starting comma, if needed.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7591)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index eb0f9c5..04c0089 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} || (),