diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 08:38:32 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 08:38:32 +0000 |
| commit | 2f7da673fdfe7453230612a5c5de68f92292b8a2 (patch) | |
| tree | 0e2912f6c8fe1b381a5556219d95b87187f43bb9 | |
| parent | ca27412f7ef1b0d083da51ed937ae7dbd171e15d (diff) | |
| download | chromium_src-2f7da673fdfe7453230612a5c5de68f92292b8a2.zip chromium_src-2f7da673fdfe7453230612a5c5de68f92292b8a2.tar.gz chromium_src-2f7da673fdfe7453230612a5c5de68f92292b8a2.tar.bz2 | |
Fix build with disabled NaCl glibc toolchain.
This is upstreaming Gentoo Linux patch.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10537124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143364 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 7 | ||||
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index aacda24..47542ca 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1018,6 +1018,13 @@ 'use_cups%': 0, }], + # Native Client glibc toolchain is enabled by default except on arm. + ['target_arch=="arm"', { + 'disable_glibc%': 1, + }, { + 'disable_glibc%': 0, + }], + # Set the relative path from this file to the GYP file of the JPEG # library used by Chromium. ['use_libjpeg_turbo==1', { diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp index 2c47c78..6dd88ac 100644 --- a/ppapi/ppapi_untrusted.gyp +++ b/ppapi/ppapi_untrusted.gyp @@ -80,7 +80,7 @@ ], }, 'conditions': [ - ['target_arch!="arm"', { + ['target_arch!="arm" and disable_glibc==0', { 'variables': { 'build_glibc': 1, # NOTE: Use /lib, not /lib64 here; it is a symbolic link which |