diff options
| author | sbc <sbc@chromium.org> | 2015-05-04 16:45:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-04 23:46:22 +0000 |
| commit | 39ebd3cdea2f1d0e9252e9bb9765f64b5ae7e25a (patch) | |
| tree | 4c4bd9fcffd13d39d0d1ff4eddbc9508bee344b3 /build | |
| parent | 56e6db77baec30e48ef94eae9f81e2793db637ea (diff) | |
| download | chromium_src-39ebd3cdea2f1d0e9252e9bb9765f64b5ae7e25a.zip chromium_src-39ebd3cdea2f1d0e9252e9bb9765f64b5ae7e25a.tar.gz chromium_src-39ebd3cdea2f1d0e9252e9bb9765f64b5ae7e25a.tar.bz2 | |
[NaCl SDK] Build sel_ldr and ncval against debian/stable sysroot
This allows sel_ldr to be deployed and run on debian/stable.
Currently we are building against the host system libraries
which are currently ubuntu/precise. This results in binarys
that depend on more recent versions of glibc than are available
in debian/stable.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk
Review URL: https://codereview.chromium.org/1061713005
Cr-Commit-Position: refs/heads/master@{#328219}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 158d972..8c690c3 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -173,6 +173,7 @@ # The system root for cross-compiles. Default: none. 'sysroot%': '', + 'use_sysroot%': 0, 'chroot_cmd%': '', # The system libdir used for this ABI. @@ -941,7 +942,7 @@ 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_arm-sysroot', }], # OS=="linux" and target_arch=="arm" and chromeos==0 - ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', { + ['OS=="linux" and ((branding=="Chrome" and buildtype=="Official" and chromeos==0) or use_sysroot==1)' , { 'conditions': [ ['target_arch=="x64"', { 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_amd64-sysroot', |