From 9943cff94566c27a2c39dfa5278b1e74c2974649 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 25 Sep 2017 08:36:31 +0000
Subject: [PATCH] Add NDEBUG to snapshot package

---
 debian/changelog | 1 +
 debian/rules     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c18e452c..1c3f5404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ llvm-toolchain-snapshot (1:6.0~svn311834-4) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Enable ocaml on release architectures.
+  * Add NDEBUG flag, lost in the -g -> -g1 switch
 
   [ Matthias Klose ]
   * Link with --no-keep-files-mapped --no-map-whole-files when using gold.
diff --git a/debian/rules b/debian/rules
index 6e5890a4..f8320493 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,10 +60,13 @@ endif
 export CC=gcc-$(GCC_VERSION)
 export CXX=g++-$(GCC_VERSION)
 
-opt_flags = -g -O2
+opt_flags = -O2 -DNDEBUG
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 ppc64el s390x))
-  opt_flags = -g1 -O2
+  opt_flags += -g1
+else
+  opt_flags += -g
 endif
+
 ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
   opt_flags += -marm
   # 3.8 fails to build, disable the compiler_rt builtins