diff options
| author | Matheus Marchini <matheus@sthima.com> | 2018-06-23 19:09:13 -0700 |
|---|---|---|
| committer | Matheus Marchini <matheus@sthima.com> | 2018-06-25 15:05:21 -0700 |
| commit | fc45b16e0f37614d620b4cf65c038a5127b1fc5e (patch) | |
| tree | 558992eb809852920812e0ebba0aad351e5dd61f | |
| parent | 19fe5299d3b52c5d17b70aec012730ffff1e3d84 (diff) | |
| download | android-node-v8-fc45b16e0f37614d620b4cf65c038a5127b1fc5e.tar.gz android-node-v8-fc45b16e0f37614d620b4cf65c038a5127b1fc5e.tar.bz2 android-node-v8-fc45b16e0f37614d620b4cf65c038a5127b1fc5e.zip | |
deps: fix gypi sysroot settings on V8
On Node.js v8.x, gn will pass a sysroot parameter to clang to use a
downloaded sysroot files while running `make test-v8`. Recently,
chromium build tools switched to use Debian sid sysroot files instead of
Debian jessie. This patch updates our V8 GYP files to conform with those
changes.
Ref: https://github.com/nodejs/node/issues/21433
PR-URL: https://github.com/nodejs/node/pull/21494
Refs: https://github.com/nodejs/node/issues/21433
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
| -rw-r--r-- | deps/v8/gypfiles/standalone.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/v8/gypfiles/standalone.gypi b/deps/v8/gypfiles/standalone.gypi index ec47f1c0ab..178f0f8256 100644 --- a/deps/v8/gypfiles/standalone.gypi +++ b/deps/v8/gypfiles/standalone.gypi @@ -93,16 +93,16 @@ ['OS=="linux" and use_sysroot==1', { 'conditions': [ ['target_arch=="arm"', { - 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_arm-sysroot', + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_arm-sysroot', }], ['target_arch=="x64"', { - 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_amd64-sysroot', + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_amd64-sysroot', }], ['target_arch=="ia32"', { - 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_i386-sysroot', + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_i386-sysroot', }], ['target_arch=="mipsel"', { - 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_mips-sysroot', + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_mips-sysroot', }], ], }], # OS=="linux" and use_sysroot==1 |