[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  18716ba2563fb371d3d25a5d7d8dcb7ddb14341b (commit)
      from  13e228d6845aff7e454eea7c9ddd392ebfbd2868 (commit)


- Log -----------------------------------------------------------------
commit 18716ba2563fb371d3d25a5d7d8dcb7ddb14341b
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Fri Sep 4 18:50:24 2015 -0500

    Supply a build rule for the recently added nptest
    
    Commit d4ab70f27cb7e518e6a9d6323c996cc3feb7496b added a test program
    to check that the NULL pointer is represented as all zero bits, but
    did not specify a build rule for that new executable.  On many platforms,
    the implicit rule sufficed, since nptest is a very simple program, but
    for at least darwin-i386-cc, an explicit rule is needed.  On darwin-i386-cc,
    the implicit rule targetted a 64-bit executable, but the object file
    containing the definition of main was a 32-bit object, which the linker
    excluded from consideration, resulting in a link failure due to no
    definition for _main.
    
    Add the missing build rule to fix the build on such platforms.
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 test/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/Makefile b/test/Makefile
index 364e887..0ee38bf 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -504,6 +504,9 @@ BUILD_CMD_STATIC=shlib_target=; \
 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
 	@target=$(RSATEST); $(BUILD_CMD)
 
+$(NPTEST)$(EXE_EXT): $(NPTEST).o $(DLIBCRYPTO)
+	@target=$(NPTEST); $(BUILD_CMD)
+
 $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
 	@target=$(BNTEST); $(BUILD_CMD)