Backport of a r201586 from upstream. scan-build was failing on some project

like firefox build system. (Yeh, advantage to be the packager of a software
that I use ;) ). See scan-build-fix-clang-detection.diff
This commit is contained in:
Sylvestre Ledru 2014-02-18 18:16:02 +00:00
parent 423d59d058
commit 723635127f
3 changed files with 30 additions and 0 deletions

3
debian/changelog vendored
View File

@ -2,6 +2,9 @@ llvm-toolchain-3.4 (1:3.4-3) UNRELEASED; urgency=medium
* Symlink for current build mode missing (Closes upstream #18836)
* Add link usr/lib/llvm-3.4/ to usr/lib/llvm-3.4/build/Debug+Asserts
* Backport of a r201586 from upstream. scan-build was failing on some project
like firefox build system. (Yeh, advantage to be the packager of a software
that I use ;) ). See scan-build-fix-clang-detection.diff
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 15 Feb 2014 11:31:13 +0100

View File

@ -0,0 +1,26 @@
Index: llvm-toolchain-3.4-3.4/clang/tools/scan-build/ccc-analyzer
===================================================================
--- llvm-toolchain-3.4-3.4.orig/clang/tools/scan-build/ccc-analyzer 2013-10-22 20:55:18.000000000 +0200
+++ llvm-toolchain-3.4-3.4/clang/tools/scan-build/ccc-analyzer 2014-02-18 18:58:07.185575339 +0100
@@ -40,17 +40,17 @@
if ($FindBin::Script =~ /c\+\+-analyzer/) {
$Compiler = $ENV{'CCC_CXX'};
- if (!defined $Compiler) { $Compiler = $DefaultCXXCompiler; }
+ if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCXXCompiler; }
$Clang = $ENV{'CLANG_CXX'};
- if (!defined $Clang) { $Clang = 'clang++'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
}
else {
$Compiler = $ENV{'CCC_CC'};
- if (!defined $Compiler) { $Compiler = $DefaultCCompiler; }
+ if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCCompiler; }
$Clang = $ENV{'CLANG'};
- if (!defined $Clang) { $Clang = 'clang'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
}
##===----------------------------------------------------------------------===##

View File

@ -36,3 +36,4 @@ fix-an-issue-in-chroot-witout-proc.diff
lldb-link-atomic.diff
0007-install-dejagnu-files.patch
fix-llvm-config-obj-src-root.patch
scan-build-fix-clang-detection.diff