diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-04 00:49:49 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-03 23:28:01 +0300 |
| commit | 3070461ecccc582eed186fa215a4c4dd36823d71 (patch) | |
| tree | fe25c290ba4425afb1b08495fd450c459b1e16f3 | |
| parent | c7f66c3a9e4f69e0bcde8819f15c9d8b972a2f75 (diff) | |
| download | meson-3070461ecccc582eed186fa215a4c4dd36823d71.zip meson-3070461ecccc582eed186fa215a4c4dd36823d71.tar.gz meson-3070461ecccc582eed186fa215a4c4dd36823d71.tar.bz2 | |
tests/common/141: Fix build on mingw64
| -rw-r--r-- | test cases/common/141 c cpp and asm/meson.build | 5 | ||||
| -rw-r--r-- | test cases/common/141 c cpp and asm/symbol-underscore.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test cases/common/141 c cpp and asm/meson.build b/test cases/common/141 c cpp and asm/meson.build index 9c90434..2c3610e 100644 --- a/test cases/common/141 c cpp and asm/meson.build +++ b/test cases/common/141 c cpp and asm/meson.build @@ -1,6 +1,7 @@ project('c cpp and asm', 'c', 'cpp') cpu = host_machine.cpu_family() +cc = meson.get_compiler('c') supported_cpus = ['arm', 'x86', 'x86_64'] @@ -12,6 +13,10 @@ if meson.get_compiler('c').get_id() == 'msvc' error('MESON_SKIP_TEST MSVC can\'t compile assembly') endif +if cc.symbols_have_underscore_prefix() + add_project_arguments('-DMESON_TEST__UNDERSCORE_SYMBOL', language: 'c') +endif + test('test-c-asm', executable('c-asm', ['main.c', 'retval-' + cpu + '.S'])) test('test-cpp-asm', executable('cpp-asm', ['main.cpp', 'retval-' + cpu + '.S'])) test('test-c-cpp-asm', executable('c-cpp-asm', ['somelib.c', 'main.cpp', 'retval-' + cpu + '.S'])) diff --git a/test cases/common/141 c cpp and asm/symbol-underscore.h b/test cases/common/141 c cpp and asm/symbol-underscore.h index 508cf50..d0f3ef9 100644 --- a/test cases/common/141 c cpp and asm/symbol-underscore.h +++ b/test cases/common/141 c cpp and asm/symbol-underscore.h @@ -1,4 +1,4 @@ -#if defined(__WIN32__) || defined(__APPLE__) +#if defined(MESON_TEST__UNDERSCORE_SYMBOL) # define SYMBOL_NAME(name) _##name #else # define SYMBOL_NAME(name) name |