Modify rpath option to support both armv7l and aarch64

Change-Id: Ib250916f0d8ca096107eb988626fa20e221bda3a
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>

diff --git a/meson.build b/meson.build
index 31a91df..204b30a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1086,7 +1086,9 @@ else
   # relevant for Vulkan drivers).
   if cc.links('static char unused() { return 5; } int main() { return 0; }',
               args : '-Wl,--gc-sections', name : 'gc-sections')
-    ld_args_gc_sections += '-Wl,--gc-sections,-rpath,/hal/lib'
+    ld_args_gc_sections += '-Wl,--gc-sections'
+    ld_args_gc_sections += '-Wl,-rpath,@0@'.format(
+                join_paths(get_option('prefix'), get_option('libdir')))
     _trial_c += ['-ffunction-sections', '-fdata-sections']
     _trial_cpp += ['-ffunction-sections', '-fdata-sections']
   endif