diff options
| -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 |