diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-09-28 10:08:14 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-11-15 18:42:25 -0800 |
| commit | 21a7528b2fe3176445d918e921fe374acafb6de2 (patch) | |
| tree | 26420aafc5a91ac3f30c1d35acc1f9f38d1edeb5 | |
| parent | 80f8c9930c1cca060dceb0f79d58823e66ea63e3 (diff) | |
| download | meson-21a7528b2fe3176445d918e921fe374acafb6de2.zip meson-21a7528b2fe3176445d918e921fe374acafb6de2.tar.gz meson-21a7528b2fe3176445d918e921fe374acafb6de2.tar.bz2 | |
compilers/c_function_attributes: fix for ICC
ICC doesn't like the extra set of parens, GCC 8.2.1 and Clang 6.0.1
don't have a problem with this.
| -rw-r--r-- | mesonbuild/compilers/c_function_attributes.py | 8 | ||||
| -rw-r--r-- | test cases/common/204 function attributes/meson.build | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/compilers/c_function_attributes.py b/mesonbuild/compilers/c_function_attributes.py index 9aeaaf2..a522a1a 100644 --- a/mesonbuild/compilers/c_function_attributes.py +++ b/mesonbuild/compilers/c_function_attributes.py @@ -91,10 +91,10 @@ C_FUNC_ATTRIBUTES = { 'used': 'int foo(void) __attribute__((used));', 'visibility': ''' - int foo_def(void) __attribute__((visibility(("default")))); - int foo_hid(void) __attribute__((visibility(("hidden")))); - int foo_int(void) __attribute__((visibility(("internal")))); - int foo_pro(void) __attribute__((visibility(("protected"))));''', + int foo_def(void) __attribute__((visibility("default"))); + int foo_hid(void) __attribute__((visibility("hidden"))); + int foo_int(void) __attribute__((visibility("internal"))); + int foo_pro(void) __attribute__((visibility("protected")));''', 'warning': 'int foo(void) __attribute__((warning("")));', 'warn_unused_result': diff --git a/test cases/common/204 function attributes/meson.build b/test cases/common/204 function attributes/meson.build index c906b49..1e93803 100644 --- a/test cases/common/204 function attributes/meson.build +++ b/test cases/common/204 function attributes/meson.build @@ -63,7 +63,7 @@ if host_machine.system() != 'darwin' attributes += 'visibility' endif -if c.get_id() == 'gcc' +if ['gcc', 'intel'].contains(c.get_id()) # not supported by clang as of 5.0.0 (at least up to 6.0.1) attributes += 'artificial' attributes += 'error' @@ -73,7 +73,7 @@ if c.get_id() == 'gcc' attributes += 'optimize' attributes += 'warning' - if c.version().version_compare('>= 7.0.0') + if c.get_id() == 'gcc' and c.version().version_compare('>= 7.0.0') attributes += 'fallthrough' endif endif |