fips/Makefile: $(CC) -dumpversion can't be used to identify gcc, HP C

doesn't return error code in reply to -dumpversion.
This commit is contained in:
Andy Polyakov 2009-05-12 20:57:11 +00:00
parent 45b364ddab
commit 6f93fd5685

View file

@ -103,7 +103,7 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
[ "$$os" = "AIX" ] && cflags="$$cflags -Wl,-bnoobjreorder"; \ [ "$$os" = "AIX" ] && cflags="$$cflags -Wl,-bnoobjreorder"; \
if [ -n "${FIPS_SITE_LD}" ]; then \ if [ -n "${FIPS_SITE_LD}" ]; then \
set -x; ${FIPS_SITE_LD} -r -o $@ $$objs; \ set -x; ${FIPS_SITE_LD} -r -o $@ $$objs; \
elif $(CC) -dumpversion >/dev/null 2>&1; then \ elif ($(CC) -v 2>&1 | grep "gcc version")>/dev/null; then \
set -x; $(CC) $$cflags -r -nostdlib -o $@ $$objs ; \ set -x; $(CC) $$cflags -r -nostdlib -o $@ $$objs ; \
else case "$$os" in \ else case "$$os" in \
HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \ HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \