Make output from openssl version -f consistent with previous versions

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 2d2671790ee12dedd92c97f35b6feb755b8d4374)

diff --git a/crypto/Makefile b/crypto/Makefile
index 70e3b84edd96b7ffad2e86703a3f01ab4312ebc2..d6bc8e43cb020b0ccfd0bc253c2b55e2765f3e5b 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -53,7 +53,7 @@ top:
 all: shared
 
 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 ecba6a2b589e1ed6fb4d33e6b9f986b5bfffb0ec..dea5da767e90d8fb55aaa05e01306d45dac4f68f 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -598,7 +598,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();