From 7deaf4701bef1ae79626e0b33123b72e8dafd18d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 20 Jun 2014 16:01:12 +0000 Subject: [PATCH] make it work in the context of scan-build --- debian/patches/force-link-pass.o.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/force-link-pass.o.diff b/debian/patches/force-link-pass.o.diff index f56b840b..acc4c133 100644 --- a/debian/patches/force-link-pass.o.diff +++ b/debian/patches/force-link-pass.o.diff @@ -1,28 +1,28 @@ -Index: llvm-toolchain-snapshot_3.5~svn211089/tools/bugpoint/Makefile +Index: llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn211089.orig/tools/bugpoint/Makefile -+++ llvm-toolchain-snapshot_3.5~svn211089/tools/bugpoint/Makefile +--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/bugpoint/Makefile ++++ llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile @@ -12,6 +12,9 @@ TOOLNAME := bugpoint LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \ bitwriter irreader vectorize objcarcopts codegen +# Crappy workaround to make sure it links correctly. -+LLVMLibsOptions := ../../lib/IR/Release/Pass.o ++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o + # Support plugins. NO_DEAD_STRIP := 1 -Index: llvm-toolchain-snapshot_3.5~svn211089/tools/opt/Makefile +Index: llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn211089.orig/tools/opt/Makefile -+++ llvm-toolchain-snapshot_3.5~svn211089/tools/opt/Makefile +--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/opt/Makefile ++++ llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile @@ -10,7 +10,9 @@ LEVEL := ../.. TOOLNAME := opt LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen +# Crappy workaround to make sure it links correctly. -+LLVMLibsOptions := ../../lib/IR/Release/Pass.o ++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o # Support plugins. NO_DEAD_STRIP := 1