From 92385b3fb617326b129609726020453c8949c7f8 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 22 Aug 2020 01:21:06 -0700
Subject: Better handle LTO_ENABLE (#9832)

* Better handle LTO_ENABLE

Especially when calling from command line

* Replace LINK_TIME_OPTIMIZATION_ENABLE with LTO_ENABLE

* Remove long for LTO from show_options.mk
---
 users/bcat/rules.mk                  | 2 +-
 users/dshields/rules.mk              | 3 +--
 users/issmirnov/rules.mk             | 2 +-
 users/kuchosauronad0/rules.mk        | 4 ++--
 users/pvinis/rules.mk                | 2 +-
 users/yanfali/rules.mk               | 2 +-
 users/yet-another-developer/rules.mk | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'users')

diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk
index a595d1f58..f87974ed9 100644
--- a/users/bcat/rules.mk
+++ b/users/bcat/rules.mk
@@ -14,7 +14,7 @@ EXTRAKEY_ENABLE = yes
 NKRO_ENABLE = yes
 
 # Enable link-time optimization to reduce binary size.
-LINK_TIME_OPTIMIZATION_ENABLE = yes
+LTO_ENABLE = yes
 
 # Disable unused build options on all keyboards.
 COMMAND_ENABLE = no
diff --git a/users/dshields/rules.mk b/users/dshields/rules.mk
index abfbe5e40..462649289 100644
--- a/users/dshields/rules.mk
+++ b/users/dshields/rules.mk
@@ -10,7 +10,7 @@ SPACE_CADET_ENABLE    = no
 LEADER_ENABLE         = no
 DYNAMIC_MACRO_ENABLE  = yes
 
-LINK_TIME_OPTIMIZATION_ENABLE = yes
+LTO_ENABLE = yes
 
 ifeq ($(strip $(KEYBOARD)), planck/rev3)
 	AUDIO_ENABLE	  = no
@@ -29,4 +29,3 @@ ifeq ($(strip $(KEYBOARD)), planck/light)
 	BACKLIGHT_ENABLE  = no
 	RGB_MATRIX_ENABLE = yes
 endif
-
diff --git a/users/issmirnov/rules.mk b/users/issmirnov/rules.mk
index 096d7b4c0..93ec21b01 100644
--- a/users/issmirnov/rules.mk
+++ b/users/issmirnov/rules.mk
@@ -4,7 +4,7 @@ SRC += issmirnov.c
 
 # https://www.reddit.com/r/olkb/comments/bmpgjm/programming_help/
 # Should shave 2000 bytes
-LINK_TIME_OPTIMIZATION_ENABLE = yes
+LTO_ENABLE = yes
 
 # Enable debugging only when needed.
 CONSOLE_ENABLE = yes # +400 bytes (hid_listen support)
diff --git a/users/kuchosauronad0/rules.mk b/users/kuchosauronad0/rules.mk
index b844d12c9..dfab85703 100644
--- a/users/kuchosauronad0/rules.mk
+++ b/users/kuchosauronad0/rules.mk
@@ -1,7 +1,7 @@
 SRC += kuchosauronad0.c \
 	   process_records.c
 
-LINK_TIME_OPTIMIZATION_ENABLE = yes
+LTO_ENABLE = yes
 SPACE_CADET_ENABLE            = no
 
 ifneq ($(strip $(RGBLIGHT_ENABLE)),yes )
@@ -24,7 +24,7 @@ ifeq ($(strip $(LEADER_ENABLE)), yes)
      SRC += leader.c
 endif
 
-ifneq ("$(wildcard $(USER_PATH)/secrets.c)","") 
+ifneq ("$(wildcard $(USER_PATH)/secrets.c)","")
      SRC += secrets.c
 endif
 ifeq ($(strip $(NO_SECRETS)), yes)
diff --git a/users/pvinis/rules.mk b/users/pvinis/rules.mk
index f6f09e54d..6c7b47399 100644
--- a/users/pvinis/rules.mk
+++ b/users/pvinis/rules.mk
@@ -14,6 +14,6 @@ SRC += pvinis.c # add userspace file
 
 ## Some extra stuff to make firmware smaller.
 
-# LINK_TIME_OPTIMIZATION_ENABLE = yes
+# LTO_ENABLE = yes
 # CONSOLE_ENABLE = no
 # COMMAND_ENABLE = no
diff --git a/users/yanfali/rules.mk b/users/yanfali/rules.mk
index 456d3bf32..a7208daa2 100644
--- a/users/yanfali/rules.mk
+++ b/users/yanfali/rules.mk
@@ -2,7 +2,7 @@ BOOTMAGIC = lite
 DYNAMIC_KEYMAP_ENABLE = no
 CONSOLE_ENABLE = yes
 COMMAND_ENABLE = yes
-LINK_TIME_OPTIMIZATION_ENABLE = yes
+LTO_ENABLE = yes
 AUDIO_ENABLE = no
 
 # only enable audio on specific boards
diff --git a/users/yet-another-developer/rules.mk b/users/yet-another-developer/rules.mk
index 597df6d0b..64cf1f2fc 100644
--- a/users/yet-another-developer/rules.mk
+++ b/users/yet-another-developer/rules.mk
@@ -1,7 +1,7 @@
 SRC += yet-another-developer.c \
        process_records.c
 
-LINK_TIME_OPTIMIZATION_ENABLE = yes
+LTO_ENABLE = yes
 SPACE_CADET_ENABLE            = no
 
 ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-- 
cgit v1.2.3