From cc3fe524c2daa8c136e6484540130da7252a8f1b Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 14 Apr 2015 08:32:38 +0200 Subject: build: Remove DISTRO build flag, don't optimize by default Currently, when building with DISTRO=0 we optimize for the build host's architecture by default. This is not compatible with cross-compiling. Remove the DISTRO flag and only build with -O2 and no -march/-mtune flags by default. Support for specifying optimization flags via configure script will be added in a follow-up patch. Signed-off-by: Tobias Klauser --- INSTALL | 7 ------- Makefile | 13 +++---------- Misc | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/INSTALL b/INSTALL index 44b5e1d..d170bc2 100644 --- a/INSTALL +++ b/INSTALL @@ -181,13 +181,6 @@ make target is executed with: $ make Q= -Concerning packaging the toolkit for a Linux distribution, by default, -netsniff-ng has some architecture-specific tuning options enabled that don't -belong into a package binary of a distribution. Hence, you might want to build -the toolkit with: - - $ make DISTRO=1 - A hardening option is also available via HARDENING=1 if needed. You can then build and install the toolkit into prefixed path like: diff --git a/Makefile b/Makefile index a16ff7f..082737c 100644 --- a/Makefile +++ b/Makefile @@ -66,19 +66,12 @@ endif # make CFLAGS="" CFLAGS_DEF = -std=gnu99 CFLAGS_DEF += -pipe +CFLAGS_DEF += -O2 ifeq ($(DEBUG), 1) - CFLAGS_DEF += -O2 CFLAGS_DEF += -g -else - ifeq ($(DISTRO), 1) - CFLAGS_DEF += -O2 - else - CFLAGS_DEF += -march=native - CFLAGS_DEF += -mtune=native - CFLAGS_DEF += -O3 - endif endif + ifeq ($(HARDENING), 1) CFLAGS_DEF += -fPIE -pie CFLAGS_DEF += -Wl,-z,relro,-z,now @@ -128,7 +121,7 @@ VERSION_LONG = "$(VERSION_SHORT)$(CONFIG_RC) ($(NAME))" export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION export CROSS_COMPILE -export DEBUG DISTRO HARDENING +export DEBUG HARDENING bold = $(shell tput bold) normal = $(shell tput sgr0) diff --git a/Misc b/Misc index 818c4a3..8031c79 100644 --- a/Misc +++ b/Misc @@ -103,7 +103,7 @@ help: $(Q)echo " nacl - Execute the build_nacl script" $(Q)echo " help - Show this help" $(Q)echo "$(bold)Available parameters:$(normal)" - $(Q)echo " DEBUG=1 / DISTRO=1 - Enable debugging / Build for distros" + $(Q)echo " DEBUG=1 - Enable debugging" $(Q)echo " HARDENING=1 - Enable GCC hardening of executables" $(Q)echo " PREFIX=/path - Install path prefix" $(Q)echo " DESTDIR=/path - Alternative install destination path" -- cgit v1.2.3-54-g00ecf