| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'visibility%': 'hidden', | 3 'visibility%': 'hidden', |
| 4 'library%': 'static_library', | 4 'library%': 'static_library', |
| 5 'component%': '', | 5 'component%': '', |
| 6 'want_separate_host_toolset': 0, | 6 'want_separate_host_toolset': 0, |
| 7 'v8_optimized_debug': 0, | 7 'v8_optimized_debug': 0, |
| 8 'v8_enable_i18n_support': 0, | 8 'v8_enable_i18n_support': 0, |
| 9 }, | 9 }, |
| 10 | 10 |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 12 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
| 13 or OS=="netbsd" or OS=="android"', { | 13 or OS=="netbsd" or OS=="android"', { |
| 14 'target_defaults': { | 14 'target_defaults': { |
| 15 # V8 headers cause a build error on recent gcc. |
| 16 # Adding -fpermissive to solve this. |
| 17 # See https://issues.adblockplus.org/ticket/4950 |
| 18 # We might be able to do without after upgrading V8. |
| 15 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', | 19 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', |
| 16 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', | 20 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', |
| 17 '-pedantic', '-std=c++0x', '-fexceptions', ], | 21 '-pedantic', '-std=c++0x', '-fexceptions', '-fpermissive' ], |
| 18 'cflags!': [ '-Werror', ], | 22 'cflags!': [ '-Werror', ], |
| 19 'ldflags': [ '-pthread', ], | 23 'ldflags': [ '-pthread', ], |
| 20 }, | 24 }, |
| 21 }], | 25 }], |
| 22 ['OS=="mac"', { | 26 ['OS=="mac"', { |
| 23 'xcode_settings': { | 27 'xcode_settings': { |
| 24 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', | 28 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| 25 'CLANG_CXX_LIBRARY': 'libc++', | 29 'CLANG_CXX_LIBRARY': 'libc++', |
| 26 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'], | 30 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'], |
| 27 }, | 31 }, |
| (...skipping 14 matching lines...) Expand all Loading... |
| 42 'msvs_cygwin_shell': 0, | 46 'msvs_cygwin_shell': 0, |
| 43 'target_conditions': [[ | 47 'target_conditions': [[ |
| 44 'OS=="mac" and _type=="executable"', { | 48 'OS=="mac" and _type=="executable"', { |
| 45 'xcode_settings': { | 49 'xcode_settings': { |
| 46 'OTHER_LDFLAGS': ['-stdlib=libc++'], | 50 'OTHER_LDFLAGS': ['-stdlib=libc++'], |
| 47 }, | 51 }, |
| 48 } | 52 } |
| 49 ]], | 53 ]], |
| 50 } | 54 } |
| 51 } | 55 } |
| OLD | NEW |