diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 211aa128c3..aa08fa81fa 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -247,13 +247,15 @@ '-pthread', ], }, + }, { # skia_os != "nacl" + 'link_settings': { + 'ldflags': [ + '-lstdc++', + '-lm', + ], + }, }], - [ 'skia_os == "chromeos"', { - 'ldflags': [ - '-lstdc++', - '-lm', - ], - }, { + [ 'skia_os != "chromeos"', { 'conditions': [ [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { 'cflags': [