diff --git a/debian/changelog b/debian/changelog
index 841a2404..d39ea0ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:6.0~svn311834-2) unstable; urgency=medium
   * Fix the FTBFS because of -gsplit-dwarf:
     - Only enable it on archs which needs it
     - Only enable it when gcc supports it correctly
+  * Fail the build if the arch + gcc has a broken gsplit-dwarf support
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 31 Aug 2017 19:14:53 +0200
 
diff --git a/debian/rules b/debian/rules
index 13710ec5..b7cc19f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe))
 LDFLAGS_EXTRA += -latomic
 endif
 
-ENABLE_SPLIT_DWARF_ARCHS := armel armhf i386 mips powerpc
+ENABLE_SPLIT_DWARF_ARCHS := armel armhf i386 mips powerpc amd64
 # Only enable gsplit dwarf on archs which needs it
 ifneq (,$(filter $(DEB_HOST_ARCH),$(ENABLE_SPLIT_DWARF_ARCHS)))
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.22.52.0.4 ; echo $$?),0)
@@ -45,6 +45,8 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++
 # Only pass -gsplit-dwarf with working version of gcc 7
 # More: https://bugs.llvm.org/show_bug.cgi?id=34140 & https://bugs.debian.org/873609
 CXXFLAGS_EXTRA += -gsplit-dwarf
+else 
+$(error "Broken gcc version for -gsplit-dwarf support. Please use  gcc 7 or > 7.2.0-2")
 endif # < gcc 7 or > 7.2.0-2
 endif # binutils
 endif # archs