diff options
| author | Nikita Churaev <lamefun.x0r@gmail.com> | 2018-01-09 22:36:13 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-09 21:36:13 +0200 |
| commit | de8018a17d9b84b2a57761ad624cc669c4e136a4 (patch) | |
| tree | 171b7c8b1b342d4aec99a371d05fbac9fddfc25d /test cases | |
| parent | 398aed6e4991016c0bba4ee829bf65f98f1a6447 (diff) | |
| download | meson-de8018a17d9b84b2a57761ad624cc669c4e136a4.tar.gz | |
Add `export_dynamic` argument to `executable`. (#2662)
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/125 shared module/meson.build | 4 | ||||
| -rw-r--r-- | test cases/common/156 shared module resolving symbol in executable/meson.build | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/test cases/common/125 shared module/meson.build b/test cases/common/125 shared module/meson.build index 29277e9e3..08a284d69 100644 --- a/test cases/common/125 shared module/meson.build +++ b/test cases/common/125 shared module/meson.build @@ -8,6 +8,6 @@ l = shared_library('runtime', 'runtime.c') # at runtime. This requires extra help on Windows, so # should be avoided unless really necessary. m = shared_module('mymodule', 'module.c') -e = executable('prog', 'prog.c', link_with : l, dependencies : dl) +e = executable('prog', 'prog.c', + link_with : l, export_dynamic : true, dependencies : dl) test('import test', e, args : m) - diff --git a/test cases/common/156 shared module resolving symbol in executable/meson.build b/test cases/common/156 shared module resolving symbol in executable/meson.build index 34a75f140..282a4d28c 100644 --- a/test cases/common/156 shared module resolving symbol in executable/meson.build +++ b/test cases/common/156 shared module resolving symbol in executable/meson.build @@ -9,13 +9,7 @@ project('shared module resolving symbol in executable', 'c') # See testcase 125 for an example of the more complex portability gymnastics # required if we do not know (at link-time) what provides the symbol. -link_flags = [] -if host_machine.system() != 'windows' - # Needed to export dynamic symbols from the executable - link_flags += ['-rdynamic'] -endif - dl = meson.get_compiler('c').find_library('dl', required: false) -e = executable('prog', 'prog.c', dependencies: dl, implib: true, link_args: link_flags) +e = executable('prog', 'prog.c', dependencies: dl, export_dynamic: true) m = shared_module('module', 'module.c', link_with: e) test('test', e, args: m.full_path()) |