Skip to content

A
angle
Commit 9d4277b0 by Tobin Ehlis Committed by Commit Bot
Options

Enable sysroot install on x86 & x64 based-systems

For builds set "use_sysroot = true" by default This is intended to fix a bot config that is hitting a build error with latest Vulkan validation layer roll. Bug: angleproject:2560 Change-Id: I06edfc7b74f367bbab23fea6f01b2778b12a470a Reviewed-on: https://chromium-review.googlesource.com/1068031Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 4428d395
Showing with 15 additions and 2 deletions
.gn
...@@ -40,5 +40,5 @@ default_args = { ...@@ -40,5 +40,5 @@ default_args = {
use_custom_libcxx = false use_custom_libcxx = false
clang_use_chrome_plugins = false clang_use_chrome_plugins = false
build_angle_deqp_tests = true build_angle_deqp_tests = true
use_sysroot = false use_sysroot = true
} }
DEPS
...@@ -127,7 +127,20 @@ hooks = [ ...@@ -127,7 +127,20 @@ hooks = [
'-s', '{root}/buildtools/linux64/gn.sha1', '-s', '{root}/buildtools/linux64/gn.sha1',
], ],
}, },
{
'name': 'sysroot_x86',
'pattern': '.',
'condition': 'checkout_linux and (checkout_x86 or checkout_x64)',
'action': ['python', '{root}/build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x86'],
},
{
'name': 'sysroot_x64',
'pattern': '.',
'condition': 'checkout_linux and checkout_x64',
'action': ['python', '{root}/build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x64'],
},
{ {
# Update the Windows toolchain if necessary. Must run before 'clang' below. # Update the Windows toolchain if necessary. Must run before 'clang' below.
'name': 'win_toolchain', 'name': 'win_toolchain',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment