fips/Makefile: $(CC) -dumpversion can't be used to identify gcc, HP C OpenSSL-fips-0_9_8-stable
authorAndy Polyakov <appro@openssl.org>
Tue, 12 May 2009 20:57:11 +0000 (20:57 +0000)
committerAndy Polyakov <appro@openssl.org>
Tue, 12 May 2009 20:57:11 +0000 (20:57 +0000)
doesn't return error code in reply to -dumpversion.

fips/Makefile

index 04b1fb08aec1dac0c6021e7aeca95ed37f1e4683..24b9e73899fb7e3e2912f62729b0f71506a077c8 100644 (file)
@@ -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 ;; \