forked from OSchip/llvm-project
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. llvm-svn: 163963
This commit is contained in:
parent
fa9e4badce
commit
b184a36aad
|
@ -885,36 +885,6 @@ sub RunXcodebuild {
|
|||
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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue