From 8a29e5ea5b5a4aabeb2bff1f47540efe5724139f Mon Sep 17 00:00:00 2001 From: Evan Martin Date: Tue, 23 Aug 2011 11:04:08 -0700 Subject: [PATCH] gyp: Don't pass C++ flags to C compiler, and don't pass -ansi in OpenSSL builds. --- common.gypi | 3 ++- deps/openssl/openssl.gyp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 8cbb78f0928..5ff4e142d2e 100644 --- a/common.gypi +++ b/common.gypi @@ -104,7 +104,8 @@ ], }], [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { - 'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions' ], + 'cflags': [ '-Wall', '-pthread', ], + 'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ], 'ldflags': [ '-pthread', ], 'conditions': [ [ 'target_arch=="ia32"', { diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 9dd7f747fa2..f4ed6d26512 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -16,6 +16,10 @@ '_REENTRANT', ], + 'cflags!': [ + '-ansi' + ], + 'conditions': [ ['OS=="win"', { 'defines': [