diff options
| author | Andy Polyakov <appro@openssl.org> | 2002-12-18 10:03:48 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2002-12-18 10:03:48 +0100 |
| commit | 07d09fdb66fbcb8f23a52c154a20d798d76d776b (patch) | |
| tree | 799fd483adb62db382c809cb9f1300c9d5580f0e /crypto/des | |
| parent | Make "perl des-586.pl a.out" work, see RT#402 (diff) | |
| download | openssl-07d09fdb66fbcb8f23a52c154a20d798d76d776b.tar.xz openssl-07d09fdb66fbcb8f23a52c154a20d798d76d776b.zip | |
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.
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/Makefile.ssl | 8 |
1 files changed, 4 insertions, 4 deletions
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 |