[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3ee24d4acaff1c247db89c5cfcac17749dc3d7bc (commit)
      from  1e62cc12f35408508594be254f40bf9b65d2a3a9 (commit)


- Log -----------------------------------------------------------------
commit 3ee24d4acaff1c247db89c5cfcac17749dc3d7bc
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 4 19:11:11 2016 +0100

    VMS build file template: assign 'arch' to local symbol table
    
    Since the local symbol table is looked up before the global symbol
    table, 'arch' assigned in the local symbol table of the DCL where MMS
    is called would be seen before the 'arch' defined in descrip.mms.
    Assigning it to the local symbol table in descrip.mms removes that
    issue.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1853)

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

Summary of changes:
 Configurations/descrip.mms.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 2c58078..d8c0d7a 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -222,7 +222,7 @@ NODEBUG=@
         $(NODEBUG) !
         $(NODEBUG) ! Figure out the architecture
         $(NODEBUG) !
-        $(NODEBUG) arch == f$edit( f$getsyi( "arch_name"), "upcase")
+        $(NODEBUG) arch = f$edit( f$getsyi( "arch_name"), "upcase")
         $(NODEBUG) !
         $(NODEBUG) ! Set up logical names for the libraries, so LINK and
         $(NODEBUG) ! running programs can use them.