diff options
| author | akos.palfi <akos.palfi@imgtec.com> | 2015-09-29 15:10:13 -0700 |
|---|---|---|
| committer | Myles Borins <myles.borins@gmail.com> | 2017-10-25 04:25:41 -0400 |
| commit | b259fd3bd566370bfe917521f28df324f63ef553 (patch) | |
| tree | d4ca01a3f0ada3bdbf5ef16d744ee910aba9e818 | |
| parent | 85800c4ba49ba8f9d39b0f556cc286d0f68d6dfd (diff) | |
| download | node-new-b259fd3bd566370bfe917521f28df324f63ef553.tar.gz | |
deps: cherry pick d7f813b4 from V8 upstream
Original commit message:
GYP: Don't pass -Wno-format-pedantic to GCC.
This flag is not understood correctly by GCC and breaks the GCC ARM and MIPS optdebug builds.
Patch from Brendan Kirby <brendan.kirby@imgtec.com>
BUG=
Review URL: https://codereview.chromium.org/1369273003
Cr-Commit-Position: refs/heads/master@{#31013}
PR-URL: https://github.com/nodejs/node/pull/15562
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
| -rw-r--r-- | deps/v8/build/standalone.gypi | 21 | ||||
| -rw-r--r-- | deps/v8/include/v8-version.h | 2 |
2 files changed, 20 insertions, 3 deletions
diff --git a/deps/v8/build/standalone.gypi b/deps/v8/build/standalone.gypi index 2cd0b51d43..48f2194aaa 100644 --- a/deps/v8/build/standalone.gypi +++ b/deps/v8/build/standalone.gypi @@ -367,8 +367,25 @@ # things when their commandline changes). Nothing should ever read this # define. 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh --print-revision)'], - 'cflags+': [ - '-Wno-format-pedantic', + 'conditions': [ + ['host_clang==1', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags+': [ + '-Wno-format-pedantic', + ], + }], + ], + }], + ['clang==1', { + 'target_conditions': [ + ['_toolset=="target"', { + 'cflags+': [ + '-Wno-format-pedantic', + ], + }], + ], + }], ], }], ], diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index b0b42462ed..20282039be 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 4 #define V8_MINOR_VERSION 5 #define V8_BUILD_NUMBER 103 -#define V8_PATCH_LEVEL 50 +#define V8_PATCH_LEVEL 51 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) |