From 0f5c7660d1e98c5e6095bfcd7f73749150ca4362 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 21 Dec 2015 11:41:14 -0800 Subject: [PATCH] Disable sysroot for x86 and x64 only In addition to https://codereview.chromium.org/1526163002 disable sysroot only for x86 and x64. Keep using sysroot for other archs due to crosscompiling. BUG=none R=fbarchard@chromium.org Review URL: https://codereview.chromium.org/1536403002 . --- libyuv.gyp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libyuv.gyp b/libyuv.gyp index 9cbf641e4..f2a999dd1 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -21,7 +21,13 @@ # Disable use of sysroot for Linux. It's enabled by default in Chromium, # but it currently lacks the libudev-dev package. # TODO(kjellander): Remove when crbug.com/561584 is fixed. - 'use_sysroot': 0, + 'conditions': [ + ['target_arch=="ia32" or target_arch=="x64"', { + 'use_sysroot': 0, + }, { + 'use_sysroot%': 1, + }], + ], }, 'use_sysroot%': '<(use_sysroot)', 'use_system_libjpeg%': 0,