diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-06-29 20:52:20 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-07-20 21:11:56 +0100 |
| commit | 8ebdbfb0f664c0a7dee1c88635a89cedfcfe92b5 (patch) | |
| tree | 7e0a4167ecfa45d2e88d54e0c40bdeb898a86044 | |
| parent | 8f859a510506318f91f639b67807a3dbdd4d0fbc (diff) | |
| download | meson-8ebdbfb0f664c0a7dee1c88635a89cedfcfe92b5.zip meson-8ebdbfb0f664c0a7dee1c88635a89cedfcfe92b5.tar.gz meson-8ebdbfb0f664c0a7dee1c88635a89cedfcfe92b5.tar.bz2 | |
Use full_path() rather than adding current_build_dir() as rpath in test common/154
| -rw-r--r-- | test cases/common/154 shared module resolving symbol in executable/meson.build | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test cases/common/154 shared module resolving symbol in executable/meson.build b/test cases/common/154 shared module resolving symbol in executable/meson.build index 06c9902..34a75f1 100644 --- a/test cases/common/154 shared module resolving symbol in executable/meson.build +++ b/test cases/common/154 shared module resolving symbol in executable/meson.build @@ -13,12 +13,9 @@ link_flags = [] if host_machine.system() != 'windows' # Needed to export dynamic symbols from the executable link_flags += ['-rdynamic'] - # Need to add this manually because Meson won't add it automatically because - # it doesn't know that we are loading a module from the build directory. - link_flags += ['-Wl,-rpath,' + meson.current_build_dir()] endif dl = meson.get_compiler('c').find_library('dl', required: false) e = executable('prog', 'prog.c', dependencies: dl, implib: true, link_args: link_flags) m = shared_module('module', 'module.c', link_with: e) -test('test', e, args: m) +test('test', e, args: m.full_path()) |