From 8ebdbfb0f664c0a7dee1c88635a89cedfcfe92b5 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 29 Jun 2017 20:52:20 +0100 Subject: Use full_path() rather than adding current_build_dir() as rpath in test common/154 --- .../154 shared module resolving symbol in executable/meson.build | 5 +---- 1 file changed, 1 insertion(+), 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()) -- cgit v1.1