From: Ted Kremenek <kremenek@apple.com>
Date: Sat, 15 Sep 2012 05:51:10 +0000 (+0000)
Subject: Revert "Utilize new build system support in Xcode 4.5 for easier interposition"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6664f43bb3ed95c9cd059fac89740cb2d976c15;p=clang

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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163963 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/scan-build/scan-build b/tools/scan-build/scan-build
index d27a07396d..a13b235aa9 100755
--- a/tools/scan-build/scan-build
+++ b/tools/scan-build/scan-build
@@ -884,36 +884,6 @@ sub RunXcodebuild {
   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);