From d02c44457f1ba898bf45e34e8282cac6380a3f26 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 22 Jun 2019 00:37:11 +0200
Subject: [PATCH] - environment-build.mk: introduce TARGET_DEBUGGING variable

---
 make/environment-build.mk | 5 ++++-
 make/static-libs.mk       | 6 +++---
 make/system-tools.mk      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 6196040b..55b2af71 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -174,6 +174,7 @@ ifeq ($(BOXSERIES), hd1)
   CORTEX-STRINGS         =
   TARGET                 = arm-cx2450x-linux-gnueabi
   TARGET_OPTIMIZATION    = -Os
+  TARGET_DEBUGGING       = -g
   TARGET_ABI             = -march=armv6 -mfloat-abi=soft -mlittle-endian
   TARGET_EXTRA_CFLAGS    = -fdata-sections -ffunction-sections
   TARGET_EXTRA_LDFLAGS   = -Wl,--gc-sections
@@ -192,6 +193,7 @@ else ifeq ($(BOXSERIES), hd2)
   CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-uclibcgnueabi
   TARGET_OPTIMIZATION    = -O2
+  TARGET_DEBUGGING       = -g
   TARGET_ABI             = -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
@@ -210,6 +212,7 @@ else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
   CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-gnueabihf
   TARGET_OPTIMIZATION    = -O2
+  TARGET_DEBUGGING       = -g
   TARGET_ABI             = -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
@@ -224,7 +227,7 @@ TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION)
 TARGET_INCLUDE_DIR = $(TARGET_DIR)/include
 TARGET_SHARE_DIR = $(TARGET_DIR)/share
 
-TARGET_CFLAGS   = -pipe $(TARGET_OPTIMIZATION) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)
+TARGET_CFLAGS   = -pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS  = $(CORTEX-STRINGS) -Wl,-O1 -Wl,-rpath,$(TARGET_LIB_DIR) -Wl,-rpath-link,$(TARGET_LIB_DIR) -L$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS)
diff --git a/make/static-libs.mk b/make/static-libs.mk
index d056c362..558f34a9 100644
--- a/make/static-libs.mk
+++ b/make/static-libs.mk
@@ -28,9 +28,9 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRIN
 	$(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
 	$(CHDIR)/cortex-strings-$(CORTEX-STRINGS_VER); \
 		./autogen.sh; \
-		CFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
-		CPPFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
-		CXXFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
+		CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \
+		CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \
+		CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \
 		LDFLAGS="-Wl,-O1 -L$(TARGET_LIB_DIR)" \
 		PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 		./configure $(CONFIGURE_OPTS) \
diff --git a/make/system-tools.mk b/make/system-tools.mk
index df040a1d..52880069 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -107,7 +107,7 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
 			--infodir=/.remove \
 			--with-pid-dir=/tmp \
 			--with-privsep-path=/var/empty \
-			--with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
+			--with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) -I$(TARGET_INCLUDE_DIR)" \
 			--with-ldflags="-L$(TARGET_LIB_DIR)" \
 			--libexecdir=/bin \
 			--disable-strip \