提交 07d09fdb 编写于 作者: A Andy Polyakov

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.
上级 4553ed27
...@@ -68,25 +68,25 @@ des: des.o cbc3_enc.o lib ...@@ -68,25 +68,25 @@ des: des.o cbc3_enc.o lib
# elf # elf
asm/dx86-elf.o: asm/dx86unix.cpp asm/dx86-elf.o: asm/dx86unix.cpp
$(CPP) -DELF \ $(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 -x c asm/dx86unix.cpp | as -o asm/dx86-elf.o
asm/yx86-elf.o: asm/yx86unix.cpp asm/yx86-elf.o: asm/yx86unix.cpp
$(CPP) -DELF \ $(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 -x c asm/yx86unix.cpp | as -o asm/yx86-elf.o
# solaris # solaris
asm/dx86-sol.o: asm/dx86unix.cpp asm/dx86-sol.o: asm/dx86unix.cpp
$(CC) -E -DSOL \ $(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 asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s
as -o asm/dx86-sol.o asm/dx86-sol.s as -o asm/dx86-sol.o asm/dx86-sol.s
rm -f asm/dx86-sol.s rm -f asm/dx86-sol.s
asm/yx86-sol.o: asm/yx86unix.cpp asm/yx86-sol.o: asm/yx86unix.cpp
$(CC) -E -DSOL \ $(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 asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s
as -o asm/yx86-sol.o asm/yx86-sol.s as -o asm/yx86-sol.o asm/yx86-sol.s
rm -f asm/yx86-sol.s rm -f asm/yx86-sol.s
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册