diff options
Diffstat (limited to 'gyp/common.gypi')
| -rw-r--r-- | gyp/common.gypi | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index b6202262d0..7dc27da143 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -21,15 +21,21 @@ # situations, like building for iOS on a Mac. 'variables': { 'conditions': [ - ['skia_os != OS and not (skia_os == "ios" and OS == "mac")', - {'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))'}], - ['skia_mesa and skia_os not in ["mac", "linux"]', - {'error': '<!(skia_mesa=1 only supported with skia_os="mac" or "linux".)'}], - ['skia_angle and not skia_os == "win"', - {'error': '<!(skia_angle=1 only supported with skia_os="win".)' + [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \ + (skia_os == "nacl" and OS == "linux"))', { + 'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))', }], - ['skia_arch_width != 32 and skia_arch_width != 64', - {'error': '<!(skia_arch_width can only be 32 or 64 bits not <(skia_arch_width) bits)' + [ 'skia_mesa and skia_os not in ["mac", "linux"]', { + 'error': '<!(skia_mesa=1 only supported with skia_os="mac" or "linux".)', + }], + [ 'skia_angle and not skia_os == "win"', { + 'error': '<!(skia_angle=1 only supported with skia_os="win".)', + }], + [ 'skia_arch_width != 32 and skia_arch_width != 64', { + 'error': '<!(skia_arch_width can only be 32 or 64 bits not <(skia_arch_width) bits)', + }], + [ 'skia_os == "nacl" and OS != "linux"', { + 'error': '<!(Skia NaCl build only currently supported on Linux.)', }], ], }, |