- environment-build.mk: rename TARGET_MARCH_CFLAGS => TARGET_ABI

make/environment-build.mk

@@ -174,7 +174,7 @@ ifeq ($(BOXSERIES), hd1)
   CORTEX-STRINGS         =
   TARGET                 = arm-cx2450x-linux-gnueabi
   TARGET_OPTIMIZATION    = -Os
-  TARGET_MARCH_CFLAGS    = -march=armv6 -mfloat-abi=soft -mlittle-endian
+  TARGET_ABI             = -march=armv6 -mfloat-abi=soft -mlittle-endian
   TARGET_EXTRA_CFLAGS    = -fdata-sections -ffunction-sections
   TARGET_EXTRA_LDFLAGS   = -Wl,--gc-sections
   CXX11_ABI              =
@@ -192,7 +192,7 @@ else ifeq ($(BOXSERIES), hd2)
   CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-uclibcgnueabi
   TARGET_OPTIMIZATION    = -O2
-  TARGET_MARCH_CFLAGS    = -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
+  TARGET_ABI             = -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
   ifeq ($(BOXMODEL), kronos_v2)
@@ -210,7 +210,7 @@ else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
   CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-gnueabihf
   TARGET_OPTIMIZATION    = -O2
-  TARGET_MARCH_CFLAGS    = -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
+  TARGET_ABI             = -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
   CXX11_ABI              =
@@ -224,7 +224,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_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)
+TARGET_CFLAGS   = -pipe $(TARGET_OPTIMIZATION) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -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)

make/system-tools-extra.mk

@@ -226,7 +226,7 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 
 # workaround unrecognized command line options
-$(D)/astra-sm: TARGET_MARCH_CFLAGS=""
+$(D)/astra-sm: TARGET_ABI=""
 $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR)
 	$(REMOVE)/astra-sm.git
 	get-git-source.sh https://gitlab.com/crazycat69/astra-sm.git $(ARCHIVE)/astra-sm.git

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_MARCH_CFLAGS) -g -I$(TARGET_INCLUDE_DIR)" \
+			--with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
 			--with-ldflags="-L$(TARGET_LIB_DIR)" \
 			--libexecdir=/bin \
 			--disable-strip \