From: Andy Polyakov <appro@openssl.org>
Date: Tue, 12 May 2009 20:57:11 +0000 (+0000)
Subject: fips/Makefile: $(CC) -dumpversion can't be used to identify gcc, HP C
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fheads%2FOpenSSL-fips-0_9_8-stable;p=oweals%2Fopenssl.git

fips/Makefile: $(CC) -dumpversion can't be used to identify gcc, HP C
doesn't return error code in reply to -dumpversion.
---

diff --git a/fips/Makefile b/fips/Makefile
index 04b1fb08ae..24b9e73899 100644
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -103,7 +103,7 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
 	[ "$$os" = "AIX" ] && cflags="$$cflags -Wl,-bnoobjreorder"; \
 	if [ -n "${FIPS_SITE_LD}" ]; then \
 		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 ; \
 	else case "$$os" in \
 		HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \