diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-06-05 07:28:39 -0700 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-06-05 07:28:39 -0700 |
| commit | 9920ae67b53283192a7396cad63f6d92b80f1a95 (patch) | |
| tree | 3c89c24c7a7759f9f46ff5e0eacd6c371ef1b562 /common.gypi | |
| parent | 2f8627528b7fa389793d1be68de3b27ebfbc3748 (diff) | |
| parent | a7dd0e51f326dfcc478cc897033e0cd7de62b65d (diff) | |
| download | android-node-v8-9920ae67b53283192a7396cad63f6d92b80f1a95.tar.gz android-node-v8-9920ae67b53283192a7396cad63f6d92b80f1a95.tar.bz2 android-node-v8-9920ae67b53283192a7396cad63f6d92b80f1a95.zip | |
Merge branch 'v0.10'
Conflicts:
ChangeLog
lib/events.js
lib/tls.js
src/node_constants.cc
src/node_crypto.cc
src/node_crypto.h
src/node_version.h
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common.gypi b/common.gypi index cfee8a1f6e..b054f511cb 100644 --- a/common.gypi +++ b/common.gypi @@ -1,13 +1,13 @@ { 'variables': { - 'werror': '', # Turn off -Werror in V8 build. - 'visibility%': 'hidden', # V8's visibility setting - 'target_arch%': 'ia32', # set v8's target architecture - 'host_arch%': 'ia32', # set v8's host architecture - 'want_separate_host_toolset': 0, # V8 should not build target and host - 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds - 'component%': 'static_library', # NB. these names match with what V8 expects - 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way + 'werror': '', # Turn off -Werror in V8 build. + 'visibility%': 'hidden', # V8's visibility setting + 'target_arch%': 'ia32', # set v8's target architecture + 'host_arch%': 'ia32', # set v8's host architecture + 'want_separate_host_toolset%': 0, # V8 should not build target and host + 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds + 'component%': 'static_library', # NB. these names match with what V8 expects + 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way 'gcc_version%': 'unknown', 'clang%': 0, 'python%': 'python', |