[SCM] sonic-visualiser/master: Fixed exporting of CXXFLAGS/LDFLAGS

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f88d630b16d32a0a06db70f097a346ed5732da07
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date:   Fri Oct 13 22:38:12 2017 +0200

    Fixed exporting of CXXFLAGS/LDFLAGS

diff --git a/debian/rules b/debian/rules
index b48c59c..f72dc4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,15 +12,15 @@ pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p')
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS)
-CXXFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS+=$(shell dpkg-buildflags --get LDFLAGS)
-
+DEB_CXXFLAGS_MAINT_APPEND=
+DEB_LDFLAGS_MAINT_APPEND=
 ifneq (,$(filter $(DEB_HOST_ARCH), i386))
-    CXXFLAGS+=-ffloat-store
-    CFLAGS+=-ffloat-store
+    DEB_CXXFLAGS_MAINT_APPEND+=-ffloat-store
 endif
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+DEB_LDFLAGS_MAINT_APPEND+= -Wl,--as-needed
+
+export DEB_CXXFLAGS_MAINT_APPEND
+export DEB_LDFLAGS_MAINT_APPEND
 
 export QT_SELECT := qt5
 

-- 
sonic-visualiser packaging