[gnome-code-assistance] [backends/c] Try both clang and llvm-clang to find sys include



commit 0680b150278ae068b836a66264eaae4237544d27
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Fri Jul 11 10:58:23 2014 +0200

    [backends/c] Try both clang and llvm-clang to find sys include

 backends/c/service.py |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/backends/c/service.py b/backends/c/service.py
index 3da40b5..d80d118 100644
--- a/backends/c/service.py
+++ b/backends/c/service.py
@@ -48,12 +48,17 @@ def config_libclang():
         if not libfile is None:
             cindex.Config.set_library_file(libfile)
 
-    try:
-        _global_sysinclude = subprocess.check_output(['llvm-clang', '-print-file-name=include']).strip()
-    except:
-        pass
+    trycmd = ('clang', 'llvm-clang')
 
-    print(_global_sysinclude)
+    for cmd in trycmd:
+        try:
+            sysdir = subprocess.check_output([cmd, '-print-file-name=include']).strip()
+
+            if sysdir and sysdir != 'include':
+                _global_sysinclude = sysdir
+                break
+        except:
+            pass
 
 class Service(transport.Service, transport.Project):
     language = 'c'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]