Fix build failure on Windows due to undefined cflags identifier

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb)

diff --git a/crypto/cversion.c b/crypto/cversion.c
index 0336adaa578482ecb2492c973b5a679920fbdf8e..881957e8923e15caa096c65604909320ce43525a 100644 (file)
--- 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 9d7b81c76e417cccc29365654e3b0b0a8cd964b1..ffa8a39933f13806d33cf3d9b16b2081bfc17b28 100755 (executable)
--- 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