Make output from openssl version -f consistent with previous versions

Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/crypto/Makefile b/crypto/Makefile
index 5e6a0c332979f899c6c962e639c7009a8e4a00e6..10782404dad5b6ab4273774ab7c8b84464bccfcf 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -64,7 +64,7 @@ fips: cryptlib.o thr_id.o uid.o $(CPUID_OBJ)
                done;
 
 buildinf.h: ../Makefile
-       $(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" >buildinf.h
+       $(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
 
 x86cpuid.s:    x86cpuid.pl perlasm/x86asm.pl
        $(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index e3d6c30de311bc937a5ee16a2bbd5379f49e5b28..f3f5d68fa3ff54d55a621a8a7bb875731c6598e2 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -836,7 +836,7 @@ open (OUT,">>crypto/buildinf.h") || die "Can't open buildinf.h";
 printf OUT <<EOF;
 #ifdef $platform_cpp_symbol
   /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
-  #define CFLAGS "$cc $cflags"
+  #define CFLAGS "compiler: $cc $cflags"
   #define PLATFORM "$platform"
 EOF
 printf OUT "  #define DATE \"%s\"\n", scalar gmtime();