[cfe-commits] r163963 - /cfe/trunk/tools/scan-build/scan-build

[Ted Kremenek]

Author: kremenek
Date: Sat Sep 15 00:51:10 2012
New Revision: 163963

URL: http://llvm.org/viewvc/llvm-project?rev=163963&view=rev
Log:
Revert "Utilize new build system support in Xcode 4.5 for easier interposition"

It's not clear if this is working yet on the buildbot.  Reverting until we have
time to investigate.

Modified:
    cfe/trunk/tools/scan-build/scan-build

Modified: cfe/trunk/tools/scan-build/scan-build
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build/scan-build?rev=163963&r1=163962&r2=163963&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build/scan-build (original)
+++ cfe/trunk/tools/scan-build/scan-build Sat Sep 15 00:51:10 2012
@@ -884,36 +884,6 @@
   if ($IgnoreErrors) {
     AddIfNotPresent($Args,"-PBXBuildsContinueAfterErrors=YES");
   }
-
-  # Detect the version of Xcode.  If Xcode 4.5 or higher, use new
-  # in situ support for analyzer interposition without needed to override
-  # the compiler.
-  open(DETECT_XCODE, "xcodebuild -version |") or
-    die "error: cannot detect version of xcodebuild\n";
-
-  my $oldBehavior = 1;
-
-  while(<DETECT_XCODE>) {
-    if (/^Xcode (.+)$/) {
-      if ($1 >= 4.5) {
-        $oldBehavior = 0;
-        last;
-      }
-    }
-  }
-  close(DETECT_XCODE);
-  
-  if ($oldBehavior == 0) {
-    my $OutputDir = $Options->{"OUTPUT_DIR"};
-    my $CLANG = $Options->{"CLANG"};
-    push @$Args,
-        "RUN_CLANG_STATIC_ANALYZER=YES",
-        "CLANG_ANALYZER_OUTPUT=plist-html",
-        "CLANG_ANALYZER_EXEC=$CLANG",
-        "CLANG_ANALYZER_OUTPUT_DIR=$OutputDir";
-
-    return (system(@$Args) >> 8);     
-  }
   
   # Default to old behavior where we insert a bogus compiler.
   SetEnv($Options);