summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-13 10:20:12 +0000
committerMatt Caswell <matt@openssl.org>2015-01-13 11:28:54 +0000
commit36f694e09add27e5619abab9de2bbb0b6bf61037 (patch)
tree1f25d14876e34c40188dd063316f2ab8a9b92b57
parent635ca4446f9f508e9e71d4aeb40c748e1198996d (diff)
Make output from openssl version -f consistent with previous versions
Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 2d2671790ee12dedd92c97f35b6feb755b8d4374)
-rw-r--r--crypto/Makefile2
-rwxr-xr-xutil/mk1mf.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index 1969fc3b9a..9a39e934ad 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -55,7 +55,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 905d1db565..7d4491faeb 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -665,7 +665,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();