From 97789ad86113a89a1e324587ccc693605381b49b Mon Sep 17 00:00:00 2001 From: vapier Date: Tue, 19 May 2015 06:24:29 -0700 Subject: [PATCH] do not hardcode -I/usr/include32 when cross-compiling When we cross-compile, we do not want any /usr/include paths as that will conflict with our own system headers. Disable the hardcoded path when we have an active sysroot. BUG=chromium:488360 Review URL: https://codereview.chromium.org/1132853010 Cr-Original-Commit-Position: refs/heads/master@{#330514} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 58b42a0c48127c60baad7ea79ea0e5576c6e1d0b --- common.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index da1ce693b..a3ed54c62 100644 --- a/common.gypi +++ b/common.gypi @@ -3864,7 +3864,7 @@ # and make sure a 32-bit-on-64-bit build picks up the # right files. # For android build, use NDK headers instead of host headers - ['host_arch!="ia32" and OS!="android"', { + ['host_arch!="ia32" and OS!="android" and use_sysroot!=1', { 'include_dirs+': [ '/usr/include32', ],