treewide: refactor to use PKG_BUILD_FLAGS:=lto

See commit 07730ff3 "treewide: add support for "lto" in PKG_BUILD_FLAGS"
on the main repository.

Note: Some packages only added `-flto` to CFLAGS and not LDFLAGS. This
fixes it and properly enables LTO.

Signed-off-by: Andre Heider <a.heider@gmail.com>

11 files changed, 19 insertions, 23 deletions

diff --git a/utils/acpid/Makefile b/utils/acpid/Makefile
index ec1d41c8a..dc9421426 100644
--- a/utils/acpid/Makefile
+++ b/utils/acpid/Makefile
@@ -22,7 +22,7 @@ PKG_CPE_ID:=cpe:/a:tedfelix:acpid
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=gc-sections
+PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -38,7 +38,6 @@ define Package/acpid/description
   The ACPI Daemon (acpid) With Netlink Support
 endef
 
-TARGET_CFLAGS += -flto
 TARGET_LDFLAGS += -Wl,--as-needed
 
 define Package/acpid/install
diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile
index 26eb1f0f1..c7181205e 100644
--- a/utils/ap51-flash/Makefile
+++ b/utils/ap51-flash/Makefile
@@ -18,6 +18,8 @@ PKG_MAINTAINER:=Russell Senior <russell@personaltelco.net>
 PKG_LICENSE:=GPL-3.0-or-later CC0-1.0
 PKG_LICENSE_FILES:=LICENSES/GPL-3.0-or-later.txt LICENSES/CC0-1.0.txt
 
+PKG_BUILD_FLAGS:=lto
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ap51-flash
@@ -32,7 +34,6 @@ MAKE_FLAGS += \
 	REVISION="$(PKG_VERSION)" \
 	ap51-flash
 
-TARGET_CFLAGS += -flto
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 
 define Package/ap51-flash/install
diff --git a/utils/coremark/Makefile b/utils/coremark/Makefile
index aead11c66..06a05c875 100644
--- a/utils/coremark/Makefile
+++ b/utils/coremark/Makefile
@@ -22,7 +22,7 @@ PKG_MAINTAINER:=Lim Guo Wei <limguowei@gmail.com> \
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE.md
 
-PKG_BUILD_FLAGS:=no-mips16
+PKG_BUILD_FLAGS:=no-mips16 lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -60,8 +60,6 @@ define Package/coremark/config
 			Number of threads to run in parallel
 endef
 
-TARGET_CFLAGS += -flto
-
 ifeq ($(CONFIG_COREMARK_OPTIMIZE_O3),y)
 	TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3
 endif
diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile
index a480caae0..c1a2b0269 100644
--- a/utils/domoticz/Makefile
+++ b/utils/domoticz/Makefile
@@ -20,7 +20,7 @@ PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=License.txt
 
 PKG_BUILD_DEPENDS:=python3 minizip cereal
-PKG_BUILD_FLAGS:=no-mips16
+PKG_BUILD_FLAGS:=no-mips16 lto
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -73,8 +73,7 @@ CMAKE_OPTIONS += \
 	-DUSE_PYTHON=yes \
 	-DWITH_LIBUSB=no
 
-TARGET_CFLAGS += -flto
-TARGET_CXXFLAGS += -DWITH_GPIO -flto
+TARGET_CXXFLAGS += -DWITH_GPIO
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
diff --git a/utils/dump1090/Makefile b/utils/dump1090/Makefile
index 2f37cd06d..ad3fbac36 100644
--- a/utils/dump1090/Makefile
+++ b/utils/dump1090/Makefile
@@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYING LICENSE
 
 PKG_BUILD_DEPENDS:=libusb
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=gc-sections
+PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -57,7 +57,6 @@ MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	UNAME="Linux"
 
-TARGET_CFLAGS += -flto
 TARGET_LDFLAGS += -Wl,--as-needed
 
 define Package/dump1090/conffiles
diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile
index 7295b6f6c..f466377cf 100644
--- a/utils/gptfdisk/Makefile
+++ b/utils/gptfdisk/Makefile
@@ -20,7 +20,7 @@ PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=gc-sections
+PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -73,7 +73,7 @@ define Package/fixparts/description
   Master Boot Record (MBR) partition tables
 endef
 
-TARGET_CXXFLAGS += -std=c++11 -fno-rtti -flto -Wno-format-security
+TARGET_CXXFLAGS += -std=c++11 -fno-rtti -Wno-format-security
 TARGET_LDFLAGS += -Wl,--as-needed
 
 define Package/gdisk/install
diff --git a/utils/readsb/Makefile b/utils/readsb/Makefile
index 47b966728..844fc0d51 100644
--- a/utils/readsb/Makefile
+++ b/utils/readsb/Makefile
@@ -20,7 +20,7 @@ PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
 
 PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=gc-sections
+PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -49,7 +49,6 @@ MAKE_FLAGS += \
 	RTLSDR=yes \
 	UNAME="Linux"
 
-TARGET_CFLAGS += -flto
 TARGET_LDFLAGS += \
 	$(if $(CONFIG_USE_GLIBC),,-largp) \
 	-Wl,--as-needed
diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile
index 9db02d0d0..8281736b5 100644
--- a/utils/smartmontools/Makefile
+++ b/utils/smartmontools/Makefile
@@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PKG_BUILD_FLAGS:=lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -78,9 +79,7 @@ define Package/smartd-mail/description
   A script for mailing about SMART issues
 endef
 
-TARGET_LDFLAGS += -flto
-
-TARGET_CXXFLAGS +=-fno-rtti -flto
+TARGET_CXXFLAGS +=-fno-rtti
 MAKE_FLAGS +=BUILD_INFO='"(localbuild)"'
 
 CONFIGURE_ARGS += \
diff --git a/utils/unrar/Makefile b/utils/unrar/Makefile
index 270120700..22e194ca3 100644
--- a/utils/unrar/Makefile
+++ b/utils/unrar/Makefile
@@ -22,10 +22,11 @@ PKG_CPE_ID:=cpe:/a:rarlab:unrar
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
+PKG_BUILD_FLAGS:=lto
 
 include $(INCLUDE_DIR)/package.mk
 
-TARGET_CXXFLAGS +=-fno-rtti -flto
+TARGET_CXXFLAGS +=-fno-rtti
 TARGET_LDFLAGS +=$(FPIC) -Wl,--gc-sections $(if $(CONFIG_USE_GLIBC),-lpthread)
 
 define Package/unrar/Default
diff --git a/utils/xz/Makefile b/utils/xz/Makefile
index 3d26b1f52..834bfdbc7 100644
--- a/utils/xz/Makefile
+++ b/utils/xz/Makefile
@@ -23,6 +23,7 @@ PKG_CPE_ID:=cpe:/a:tukaani:xz
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PKG_BUILD_FLAGS:=lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -71,7 +72,7 @@ define BuildSubPackage
   $$(eval $$(call BuildPackage,$(1)))
 endef
 
-TARGET_LDFLAGS += -Wl,--gc-sections -flto
+TARGET_LDFLAGS += -Wl,--gc-sections
 
 CONFIGURE_ARGS += \
 	--enable-small \
diff --git a/utils/zsh/Makefile b/utils/zsh/Makefile
index 9ab461df7..6fc713a5d 100644
--- a/utils/zsh/Makefile
+++ b/utils/zsh/Makefile
@@ -22,7 +22,7 @@ PKG_CPE_ID:=cpe:/a:zsh_project:zsh
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
-PKG_BUILD_FLAGS:=gc-sections
+PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -83,8 +83,8 @@ define Build/Configure
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" prep
 endef
 
-TARGET_CFLAGS += $(FPIC) -flto
-TARGET_LDFLAGS += $(FPIC) -flto
+TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += $(FPIC)
 
 define Package/zsh/postinst
 #!/bin/sh