Skip to content

Commit fc45b16

Browse files
author
Matheus Marchini
committedJun 25, 2018
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: #21433 PR-URL: #21494 Refs: #21433 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ali Ijaz Sheikh <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 19fe529 commit fc45b16

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎deps/v8/gypfiles/standalone.gypi

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@
9393
['OS=="linux" and use_sysroot==1', {
9494
'conditions': [
9595
['target_arch=="arm"', {
96-
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_arm-sysroot',
96+
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_arm-sysroot',
9797
}],
9898
['target_arch=="x64"', {
99-
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_amd64-sysroot',
99+
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_amd64-sysroot',
100100
}],
101101
['target_arch=="ia32"', {
102-
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_i386-sysroot',
102+
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_i386-sysroot',
103103
}],
104104
['target_arch=="mipsel"', {
105-
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_jessie_mips-sysroot',
105+
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_mips-sysroot',
106106
}],
107107
],
108108
}], # OS=="linux" and use_sysroot==1

0 commit comments

Comments
 (0)
Please sign in to comment.