From: Andy Polyakov <appro@openssl.org>
Date: Wed, 18 Dec 2002 09:02:07 +0000 (+0000)
Subject: Fix for RT#405, Solaris refuses to invoke preprocessor if egrep returns 1.
X-Git-Tag: OpenSSL_0_9_7~48
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a92a9f02fb1e088803f10724432b3c1cb4515fec;p=oweals%2Fopenssl.git

Fix for RT#405, Solaris refuses to invoke preprocessor if egrep returns 1.
Linux for example doesn't exhibit this behaviour, but I add "exit 0" to all
potentially affected rules, just to be on the safe side.
---

diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index aedfbb4cb4..2edb542db9 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -68,25 +68,25 @@ des: des.o cbc3_enc.o lib
 # elf
 asm/dx86-elf.o: asm/dx86unix.cpp
 	$(CPP) -DELF	\
-		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC`\
+		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC; exit 0`\
 		-x c asm/dx86unix.cpp | as -o asm/dx86-elf.o
 
 asm/yx86-elf.o: asm/yx86unix.cpp
 	$(CPP) -DELF	\
-		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC`\
+		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC; exit 0`\
 		-x c asm/yx86unix.cpp | as -o asm/yx86-elf.o
 
 # solaris
 asm/dx86-sol.o: asm/dx86unix.cpp
 	$(CC) -E -DSOL	\
-		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC`\
+		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC; exit 0`\
 		asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s
 	as -o asm/dx86-sol.o asm/dx86-sol.s
 	rm -f asm/dx86-sol.s
 
 asm/yx86-sol.o: asm/yx86unix.cpp
 	$(CC) -E -DSOL	\
-		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC`\
+		`(echo $(CFLAGS) | egrep -ie '-[fK]PIC') > /dev/null 2>&1 && echo -DPIC; exit 0`\
 		asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s
 	as -o asm/yx86-sol.o asm/yx86-sol.s
 	rm -f asm/yx86-sol.s