From ba274d77da74eaf3320dd8211ca58113fd206515 Mon Sep 17 00:00:00 2001
From: gixxpunk <thomas.harfmann@gmail.com>
Date: Sat, 16 Sep 2017 23:50:51 +0200
Subject: [PATCH] - rework even more compiler flags

---
 make/environment.mk |  1 +
 make/neutrino.mk    | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/make/environment.mk b/make/environment.mk
index c6af9aea..30899dd9 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -214,6 +214,7 @@ BUILDENV = \
 	NM=$(TARGET)-nm \
 	AR=$(TARGET)-ar \
 	AS=$(TARGET)-as \
+	LDD=$(TARGET)-ldd \
 	RANLIB=$(TARGET)-ranlib \
 	STRIP=$(TARGET)-strip \
 	OBJCOPY=$(TARGET)-objcopy \
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 127f236f..4dfe5895 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -22,8 +22,6 @@ else
 	N_CFLAGS += $(TARGET_CFLAGS)
 endif
 
-N_CPPFLAGS += -I$(TARGETINCLUDE)
-
 N_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS) -L$(TARGETLIB)
 ifeq ($(DEBUG), yes)
 	N_LDFLAGS += -Wl,-rpath-link,$(TARGETLIB)
@@ -57,7 +55,22 @@ endif
 		test -e version.h || touch version.h && \
 		export PKG_CONFIG=$(PKG_CONFIG) && \
 		export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
-		CC=$(TARGET)-gcc CFLAGS="$(N_CFLAGS)" CXXFLAGS="$(N_CFLAGS)" CPPFLAGS="$(N_CPPFLAGS)" LDFLAGS="$(N_LDFLAGS)" \
+		CC=$(TARGET)-gcc \
+		CXX=$(TARGET)-g++ \
+		LD=$(TARGET)-ld \
+		NM=$(TARGET)-nm \
+		AR=$(TARGET)-ar \
+		AS=$(TARGET)-as \
+		LDD=$(TARGET)-ldd \
+		RANLIB=$(TARGET)-ranlib \
+		STRIP=$(TARGET)-strip \
+		OBJCOPY=$(TARGET)-objcopy \
+		OBJDUMP=$(TARGET)-objdump \
+		READELF=$(TARGET)-readelf \
+		CFLAGS="$(N_CFLAGS)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \
+		LDFLAGS="$(N_LDFLAGS)" \
 		$(N_HD_SOURCE)/configure \
 			--host=$(TARGET) \
 			--build=$(BUILD) \