* debian/rules:

- Ensure ld-gold is used. CMake invokes the linker through g++ most of the
    time, therefore we need to set -Wl,-fuse-ld=gold.
  - Remove unused variable "confargs".

debian/changelog

@@ -1,8 +1,10 @@
 llvm-toolchain-snapshot (1:3.9~svn272379-1.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
-  * debian/rules: Ensure ld-gold is used. CMake invokes the linker through
-    g++ most of the time, therefore we need to set -Wl,-fuse-ld=gold.
+  * debian/rules:
+    - Ensure ld-gold is used. CMake invokes the linker through g++ most of the
+      time, therefore we need to set -Wl,-fuse-ld=gold.
+    - Remove unused variable "confargs".
 
  -- Kai Wasserbäch <curan@debian.org>  Fri, 10 Jun 2016 20:07:20 +0200
 

debian/rules

@@ -41,15 +41,6 @@ endif
 export CC=gcc-$(GCC_VERSION)
 export CXX=g++-$(GCC_VERSION)
 
-confargs := \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
-
-ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH_BITS),64)
-  confargs += --with-cxx-include-32bit-dir=32
-else
-  confargs += --with-cxx-include-64bit-dir=64
-endif
-
 opt_flags = -g -O2
 ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
   opt_flags += -marm
@@ -83,7 +74,6 @@ ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
 # for -fvisibility-inlines-hidden see http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20130729/183016.html
 	CXXFLAGS_EXTRA += -fprofile-arcs -ftest-coverage
 	LDFLAGS_EXTRA += -coverage -lgcov
-	confargs += llvm_cv_cxx_visibility_inlines_hidden=no
 endif
 
 ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS)))