diff options
| author | Fedor Indutny <fedor@indutny.com> | 2015-01-08 19:05:43 +0000 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2015-01-12 21:31:08 +0300 |
| commit | ced41b07dd6ebeaceb2a9be1d2bb6376eb7d0db4 (patch) | |
| tree | 7764e83dde863a650414fd26fcac0cbba6a8afcb /deps | |
| parent | b910613792dac946b295855963869933a9089044 (diff) | |
| download | android-node-v8-ced41b07dd6ebeaceb2a9be1d2bb6376eb7d0db4.tar.gz android-node-v8-ced41b07dd6ebeaceb2a9be1d2bb6376eb7d0db4.tar.bz2 android-node-v8-ced41b07dd6ebeaceb2a9be1d2bb6376eb7d0db4.zip | |
openssl: fix build failure on windows
Backport of: https://github.com/openssl/openssl/commit/5c5e7e
Original commit message:
Fix build failure on Windows due to undefined cflags identifier
Reviewed-by: Tim Hudson <tjh@openssl.org>
PR-URL: https://github.com/iojs/io.js/pull/289
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/openssl/openssl/crypto/cversion.c | 2 | ||||
| -rwxr-xr-x | deps/openssl/openssl/util/mkbuildinf.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deps/openssl/openssl/crypto/cversion.c b/deps/openssl/openssl/crypto/cversion.c index 0336adaa57..881957e892 100644 --- a/deps/openssl/openssl/crypto/cversion.c +++ b/deps/openssl/openssl/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/deps/openssl/openssl/util/mkbuildinf.pl b/deps/openssl/openssl/util/mkbuildinf.pl index 9d7b81c76e..ffa8a39933 100755 --- a/deps/openssl/openssl/util/mkbuildinf.pl +++ b/deps/openssl/openssl/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 |