diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 01:53:43 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 01:53:43 +0000 |
| commit | 84b00d12f2ae5d9833c70e5aa57cfc1c77d2518a (patch) | |
| tree | 0ba5bc659c169a5d750e3c36d9510c230a1522d8 /build | |
| parent | 0904e43fe00572d6adb2a6550956a9ac57c3e2ca (diff) | |
| download | chromium_src-84b00d12f2ae5d9833c70e5aa57cfc1c77d2518a.zip chromium_src-84b00d12f2ae5d9833c70e5aa57cfc1c77d2518a.tar.gz chromium_src-84b00d12f2ae5d9833c70e5aa57cfc1c77d2518a.tar.bz2 | |
Don't fail at gyp time if arm-sysroot is missing.
This fixes the NaCl SDK build which builds with target_arch=arm
but only builds untrusted targets so doesn't need the arm
sysroot.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11554028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 36d5771..9c24e2c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -597,9 +597,9 @@ 'linux_breakpad%': 0, 'linux_use_tcmalloc%': 0, 'linux_use_gold_flags%': 0, - # sysroot need to be an absolute path otherwise it generates + # sysroot needs to be an absolute path otherwise it generates # incorrect results when passed to pkg-config - 'sysroot%': '<!(cd <(DEPTH)/arm-sysroot && pwd -P)', + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', }], # OS=="linux" and target_arch=="arm" and chromeos==0 ], |