Merge remote-tracking branch 'origin/10.0'

Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079

1 files changed, 10 insertions, 3 deletions

diff --git a/scripts/deployqt.py b/scripts/deployqt.py
index 05113e43e7..79aea111bd 100755
--- a/scripts/deployqt.py
+++ b/scripts/deployqt.py
@@ -273,13 +273,20 @@ def deploy_elfutils(qtc_install_dir, chrpath_bin, args):
     if common.is_mac_platform():
         return
 
+    libs = ['elf', 'dw']
+    version = '1'
+
     def lib_name(name, version):
         return ('lib' + name + '.so.' + version if common.is_linux_platform()
                 else name + '.dll')
 
-    version = '1'
-    libs = ['elf', 'dw']
-    elfutils_lib_path = os.path.join(args.elfutils_path, 'lib')
+    def find_elfutils_lib_path(path):
+        for root, _, files in os.walk(path):
+            if lib_name('elf', version) in files:
+                return root
+        return path
+
+    elfutils_lib_path = find_elfutils_lib_path(os.path.join(args.elfutils_path, 'lib'))
     if common.is_linux_platform():
         install_path = os.path.join(qtc_install_dir, 'lib', 'elfutils')
         backends_install_path = install_path