From: Matt Caswell <matt@openssl.org>
Date: Tue, 13 Jan 2015 10:20:12 +0000 (+0000)
Subject: Make output from openssl version -f consistent with previous versions
X-Git-Tag: master-post-reformat~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d2671790ee12dedd92c97f35b6feb755b8d4374;p=oweals%2Fopenssl.git

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 5e6a0c3329..10782404da 100644
--- 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 e3d6c30de3..f3f5d68fa3 100755
--- 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();