From: Matt Caswell <matt@openssl.org>
Date: Tue, 15 Dec 2015 23:35:31 +0000 (+0000)
Subject: Fix build on Solaris
X-Git-Tag: OpenSSL_1_1_0-pre2~217
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19a86b03010c111d4e05ce252247e30f0e940dad;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/crypto/async/Makefile b/crypto/async/Makefile
index 44da77f3e0..bdecc4e33a 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