Browse Source

gyp: Don't pass C++ flags to C compiler, and don't pass -ansi in OpenSSL builds.

Evan Martin 14 years ago
committed by Ryan Dahl
parent
commit
8a29e5ea5b
  1. 3
      common.gypi
  2. 4
      deps/openssl/openssl.gyp

3
common.gypi

@ -104,7 +104,8 @@
], ],
}], }],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { [ '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', ], 'ldflags': [ '-pthread', ],
'conditions': [ 'conditions': [
[ 'target_arch=="ia32"', { [ 'target_arch=="ia32"', {

4
deps/openssl/openssl.gyp

@ -16,6 +16,10 @@
'_REENTRANT', '_REENTRANT',
], ],
'cflags!': [
'-ansi'
],
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
'defines': [ 'defines': [

Loading…
Cancel
Save