summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d>2014-08-05 12:58:05 +0000
committersylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d>2014-08-05 12:58:05 +0000
commitc9a74bd6690311b75b65ebd5fbcbd7616b98e850 (patch)
treef60c6113e32388e975939049aa3d087b8445b437
parentac388bc0c94556577fd40726ea128f884e6b00c4 (diff)
downloadllvm-toolchain-3.5-c9a74bd6690311b75b65ebd5fbcbd7616b98e850.tar.gz
Force scan-build to use the same version of clang
git-svn-id: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.5@1314 670adf90-79fe-46c2-b027-9eb1e76e7c7d
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/scan-build-clang-path.diff2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 95efb4b..8f858be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
llvm-toolchain-3.5 (1:3.5~+rc1-3~exp2) UNRELEASED; urgency=medium
* Enable compressed debug sections (Closes: #757002)
+ * Force scan-build to use the same version of clang
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 04 Aug 2014 13:35:35 +0200
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 35178f9..1610770 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build
# Find 'clang'
if (!defined $AnalyzerDiscoveryMethod) {
- $Clang = Cwd::realpath("$RealBin/bin/clang");
-+ $Clang = Cwd::realpath("/usr/bin/clang");
++ $Clang = Cwd::realpath("/usr/lib/llvm-3.5/bin/clang");
if (!defined $Clang || ! -x $Clang) {
$Clang = Cwd::realpath("$RealBin/clang");
}