summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-08 19:05:43 +0000
committerMatt Caswell <matt@openssl.org>2015-01-08 19:26:28 +0000
commit56cd7404499669a32126b5fee2ff75a97fea43f7 (patch)
treeee1e712f51d74a6a4d9df7cdb5748d5c910dd920
parent8437225d341fc3b278a6236cd9ecc0f0c0dfb34e (diff)
Fix build failure on Windows due to undefined cflags identifier
Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb)
-rw-r--r--crypto/cversion.c2
-rwxr-xr-xutil/mkbuildinf.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cversion.c b/crypto/cversion.c
index 0336adaa57..881957e892 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -77,7 +77,7 @@ const char *SSLeay_version(int t)
if (t == SSLEAY_CFLAGS)
{
#ifdef CFLAGS
- return(cflags);
+ return(CFLAGS);
#else
return("compiler: information not available");
#endif
diff --git a/util/mkbuildinf.pl b/util/mkbuildinf.pl
index 9d7b81c76e..ffa8a39933 100755
--- a/util/mkbuildinf.pl
+++ b/util/mkbuildinf.pl
@@ -7,7 +7,7 @@ $date = localtime();
print <<"END_OUTPUT";
#ifndef MK1MF_BUILD
/* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */
- #define CFLAGS
+ #define CFLAGS cflags
/*
* Generate CFLAGS as an array of individual characters. This is a
* workaround for the situation where CFLAGS gets too long for a C90 string