diff --git a/debian/changelog b/debian/changelog
index 27e15ade..95852a70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,6 @@ llvm-toolchain-snapshot (1:4.0~svn280796-1~exp1) experimental; urgency=medium
 llvm-toolchain-3.9 (1:3.9-1) unstable; urgency=medium
 
   * New stable release
->>>>>>> .merge-right.r2207
   * Port to kfreebsd. Many thanks to Pino Toscano
     (Closes: #835665)
   * clang_getAllSkippedRanges in the list of libclang1 symbols
diff --git a/debian/patches/fix-lldb-server-build b/debian/patches/fix-lldb-server-build
index f8ed5b59..ee4e2f55 100644
--- a/debian/patches/fix-lldb-server-build
+++ b/debian/patches/fix-lldb-server-build
@@ -9,3 +9,60 @@
        set(llvm_libs LLVM)
      else()
        llvm_map_components_to_libnames(llvm_libs
+--- a/polly/lib/CMakeLists.txt
++++ b/polly/lib/CMakeLists.txt
+@@ -66,35 +66,26 @@
+ 
+ target_link_libraries(Polly PollyISL jsoncpp)
+ 
+-if (BUILD_SHARED_LIBS)
+-  target_link_libraries(Polly
+-    LLVMSupport
+-    LLVMCore
+-    LLVMScalarOpts
+-    LLVMInstCombine
+-    LLVMTransformUtils
+-    LLVMAnalysis
+-    LLVMipo
+-    LLVMMC
++target_link_libraries(Polly
++  LLVMSupport
++  LLVMCore
++  LLVMScalarOpts
++  LLVMInstCombine
++  LLVMTransformUtils
++  LLVMAnalysis
++  LLVMipo
++  LLVMMC
+ # The libraries below are required for darwin: http://PR26392
+-    LLVMBitReader
+-    LLVMMCParser
+-    LLVMObject
+-    LLVMProfileData
+-    LLVMTarget
+-    LLVMVectorize
+-  )
+-  link_directories(
+-    ${LLVM_LIBRARY_DIR}
+-  )
+-elseif (LLVM_LINK_LLVM_DYLIB)
+-  target_link_libraries(Polly
+-    LLVM
+-  )
+-  link_directories(
+-    ${LLVM_LIBRARY_DIR}
+-  )
+-endif()
++  LLVMBitReader
++  LLVMMCParser
++  LLVMObject
++  LLVMProfileData
++  LLVMTarget
++  LLVMVectorize
++)
++link_directories(
++  ${LLVM_LIBRARY_DIR}
++)
+ 
+ # Build a monolithic Polly.a and a thin module LLVMPolly.moduleext that links to
+ # that static library.
diff --git a/debian/patches/series b/debian/patches/series
index aa5b2958..1c5c100e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,5 +35,5 @@ disable-source-interleave.diff
 silent-gold-utils.diff
 disable-llvm-symbolizer-test.diff
 kfreebsd-support.diff
-#fix-lldb-server-build
+fix-lldb-server-build
 clang-tidy-run-bin.diff
diff --git a/debian/rules b/debian/rules
index ebb88e54..7962b0d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -465,7 +465,7 @@ endif
 
 # LLDB tests (CMake)
 ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
-ifneq (,$(filter codecoverageDISABLED,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
 	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/$(TARGET_BUILD)/lib/ $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-lldb || true
 endif
 endif