diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
| commit | 6f2f5f4afa6f628ad3d068e9ba55fc6455eefa12 (patch) | |
| tree | d360bbbdff678c19142facabc46f30f693fe32e9 /debian/rules | |
| parent | 1f5a2d63b784eb919143d0be3f2dee7ff0bb7e83 (diff) | |
| parent | 56e47f3111ad714c6506c0d60dccb92cfc9311cb (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 0101a303d..6761177f9 100755 --- a/debian/rules +++ b/debian/rules @@ -24,11 +24,11 @@ ifneq (,$(shell which dpkg-buildflags)) # make does not export to $(shell) so we need to workaround # (http://savannah.gnu.org/bugs/?10593) dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags - + # workaround gcc-5 compile error # (see https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1473674) export CXXFLAGS = $(subst -O3,-O2,$(shell $(dpkg_buildflags) --get CXXFLAGS)) - + export LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS) export CPPFLAGS = $(shell $(dpkg_buildflags) --get CPPFLAGS) else |