Mercurial > forge
changeset 12683:d36d7d7c4b68 octave-forge
honor compiler flags
- do not force but only enable debian hardening
- fixes build on debian/wheezy
author | schloegl |
---|---|
date | Sun, 30 Aug 2015 00:10:09 +0000 |
parents | e97980ace11d |
children | 29631e455f62 |
files | extra/NaN/src/Makefile |
diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/NaN/src/Makefile Mon Aug 24 08:51:53 2015 +0000 +++ b/extra/NaN/src/Makefile Sun Aug 30 00:10:09 2015 +0000 @@ -37,11 +37,9 @@ OCTMEX = $(MKOCTFILE) --mex RM = rm -# Hardening: https://wiki.debian.org/HardeningWalkthrough#Handwritten_Makefiles -#CFLAGS = `dpkg-buildflags --get CFLAGS` -#CFLAGS += `dpkg-buildflags --get CPPFLAGS` -#CFLAGS += `dpkg-buildflags --get LDFLAGS` -CFLAGS += -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -Wl,-z,relro +# Support Debian Hardening flags +# https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system +CFLAGS += $(CPPFLAGS) ifneq ($(OS),Windows_NT) CFLAGS += -fPIC