summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPatrick Griffis <tingping@tingping.se>2017-06-14 23:38:41 -0400
committerPatrick Griffis <tingping@tingping.se>2017-06-14 23:55:40 -0400
commit2dfe5357a99736fc848255d7078c4b1d8cfe6884 (patch)
tree449f4abaac903b988548578a9cd63c8b43afd017
parent67adfa6f54ee86d73b5e6cbb235f68ff43fd9179 (diff)
build: Fix setting the *installed* rpath for perl too...
-rw-r--r--plugins/perl/meson.build12
1 files changed, 11 insertions, 1 deletions
diff --git a/plugins/perl/meson.build b/plugins/perl/meson.build
index 08764a16..5e5d6d71 100644
--- a/plugins/perl/meson.build
+++ b/plugins/perl/meson.build
@@ -37,8 +37,17 @@ if ret.returncode() != 0
   error('perl: Failed to get ldflags')
 endif
 perl_ldflags = []
+perl_rpath = ''
 foreach flag : ret.stdout().strip().split(' ')
-  if flag.startswith('-L') or flag.startswith('-l') or flag.startswith('-Wl')
+  if flag.startswith('-L') or flag.startswith('-l')
+    perl_ldflags += flag
+  endif
+  if flag.startswith('-Wl,-rpath,')
+    # Install rpath
+    split = flag.split(',')
+    perl_rpath = split[split.length() - 1]
+
+    # For in tree
     perl_ldflags += flag
   endif
 endforeach
@@ -69,5 +78,6 @@ shared_module('perl',
   link_args: perl_ldflags,
   install: true,
   install_dir: plugindir,
+  install_rpath: perl_rpath,
   name_prefix: '',
 )