[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  19a86b03010c111d4e05ce252247e30f0e940dad (commit)
      from  3addf183fa23a3dd5338679d8a6d0711fe9bd0a0 (commit)


- Log -----------------------------------------------------------------
commit 19a86b03010c111d4e05ce252247e30f0e940dad
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Dec 15 23:35:31 2015 +0000

    Fix build on Solaris
    
    Solaris builds were failing during async compilation because the .o files
    created from compiling the corresponding .c files held in async/arch were
    ending up in the top level async directory. Consequently the link fails
    because it can't find the .o files.
    
    Thanks to Richard Levitte for pointing me in the right direction on this.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/async/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/async/Makefile b/crypto/async/Makefile
index 44da77f..bdecc4e 100644
--- a/crypto/async/Makefile
+++ b/crypto/async/Makefile
@@ -74,6 +74,10 @@ clean:
 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 	rm -f arch/*.o arch/*.obj arch/lib arch/tags arch/core arch/.pure arch/.nfs* arch/*.old arch/*.bak arch/fluff
 
+# Different flavours of make disagree on where output goes
+.c.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 arch/async_null.o: ../../e_os.h ../../include/openssl/async.h