1 files changed, 19 insertions, 3 deletions
diff --git a/tools/scan-build/set-xcode-analyzer b/tools/scan-build/set-xcode-analyzer
index c280bb4d40a3..93824af255d6 100755
--- a/tools/scan-build/set-xcode-analyzer
+++ b/tools/scan-build/set-xcode-analyzer
@@ -20,10 +20,19 @@ def FindClangSpecs(path):
       if f.endswith(".xcspec") and f.startswith("Clang LLVM"):
         yield os.path.join(root, f)
 
-def ModifySpec(path, pathToChecker):
+def ModifySpec(path, isBuiltinAnalyzer, pathToChecker):
   t = tempfile.NamedTemporaryFile(delete=False)
   foundAnalyzer = False
   with open(path) as f:
+    if isBuiltinAnalyzer:
+      # First search for CLANG_ANALYZER_EXEC.  Newer
+      # versions of Xcode set EXEC_PATH to be CLANG_ANALYZER_EXEC.
+      with open(path) as f2:
+        for line in f2:
+          if line.find("CLANG_ANALYZER_EXEC") >= 0:
+            pathToChecker = "$(CLANG_ANALYZER_EXEC)"
+            break
+    # Now create a new file.
     for line in f:
       if not foundAnalyzer:
         if line.find("Static Analyzer") >= 0:
@@ -63,6 +72,7 @@ def main():
       print "(-) You must quit Xcode first before modifying its configuration files."
       return
 
+  isBuiltinAnalyzer = False
   if options.path:
     # Expand tildes.
     path = os.path.expanduser(options.path)
@@ -74,19 +84,25 @@ def main():
   else:
     print "(+) Using the Clang bundled with Xcode"
     path = options.default
+    isBuiltinAnalyzer = True
   
   try:
     xcode_path = subprocess.check_output(["xcode-select", "-print-path"])
   except AttributeError:
     # Fall back to the default install location when using Python < 2.7.0
     xcode_path = "/Developer"
-  if (re.search("Xcode.app", xcode_path)):
+  if (xcode_path.find(".app/") != -1):
     # Cut off the 'Developer' dir, as the xcspec lies in another part
     # of the Xcode.app subtree.
     xcode_path = os.path.dirname(xcode_path)
   
+  foundSpec = False
   for x in FindClangSpecs(xcode_path):
-    ModifySpec(x, path)
+    foundSpec = True
+    ModifySpec(x, isBuiltinAnalyzer, path)
+    
+  if foundSpec == False:
+      print "(-) No compiler configuration file was found.  Xcode's analyzer has not been updated."
 
 if __name__ == '__main__':
   main()