Update patches/gcc.patch
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Nobuhiro Iwamatsu
7 years ago
| 0 | 0 | diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi |
| 1 | index 1848263..3c2b3ba 100644 | |
| 1 | index d78f4f8..c5f91ca 100644 | |
| 2 | 2 | --- a/src/gyp/common.gypi |
| 3 | 3 | +++ b/src/gyp/common.gypi |
| 4 | @@ -161,9 +161,9 @@ | |
| 4 | @@ -134,10 +134,10 @@ | |
| 5 | 'compiler_host_version_int': 304, # Clang 3.4 or higher | |
| 6 | }], | |
| 5 | 7 | ['target_platform=="Linux"', { |
| 6 | # enable_gtk_renderer represents if mozc_renderer is supported on Linux | |
| 7 | # or not. | |
| 8 | 8 | - 'compiler_target': 'clang', |
| 9 | + 'compiler_target': 'gcc', | |
| 10 | 'compiler_target_version_int': 304, # Clang 3.4 or higher | |
| 9 | - 'compiler_target_version_int': 304, # Clang 3.4 or higher | |
| 11 | 10 | - 'compiler_host': 'clang', |
| 12 | + 'compiler_host': 'gcc', | |
| 13 | 'compiler_host_version_int': 304, # Clang 3.4 or higher | |
| 14 | 'enable_gtk_renderer%': 1, | |
| 15 | }, { # else | |
| 16 | @@ -885,8 +885,8 @@ | |
| 11 | - 'compiler_host_version_int': 304, # Clang 3.4 or higher | |
| 12 | + 'compiler_target': 'g++', | |
| 13 | + 'compiler_target_version_int': 409, # gcc 4.9 or higher | |
| 14 | + 'compiler_host': 'g++', | |
| 15 | + 'compiler_host_version_int': 409, # gcc 4.9 or higher | |
| 16 | }], | |
| 17 | ], | |
| 18 | }, | |
| 19 | @@ -455,8 +455,8 @@ | |
| 17 | 20 | ['target_platform=="Linux"', { |
| 18 | 21 | 'make_global_settings': [ |
| 19 | 22 | ['AR', '<!(which ar)'], |