From 696f7401aa0c217b27e9d4b372f93abafd168854 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 28 Dec 2025 02:15:07 -0800 Subject: [PATCH] Move LTO settings to cachySettings.nix --- kernel-cachyos/cachySettings.nix | 18 ++++++++++++++++++ kernel-cachyos/mkCachyKernel.nix | 10 +--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/kernel-cachyos/cachySettings.nix b/kernel-cachyos/cachySettings.nix index 088c093..061386b 100644 --- a/kernel-cachyos/cachySettings.nix +++ b/kernel-cachyos/cachySettings.nix @@ -42,6 +42,24 @@ with lib.kernel; HZ = freeform hz; }); + lto = { + none = { + LTO_NONE = yes; + LTO_CLANG_THIN = no; + LTO_CLANG_FULL = no; + }; + thin = { + LTO_NONE = no; + LTO_CLANG_THIN = yes; + LTO_CLANG_FULL = no; + }; + full = { + LTO_NONE = no; + LTO_CLANG_THIN = no; + LTO_CLANG_FULL = yes; + }; + }; + performanceGovernor = { CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = no; CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes; diff --git a/kernel-cachyos/mkCachyKernel.nix b/kernel-cachyos/mkCachyKernel.nix index 97ff885..ce54a85 100644 --- a/kernel-cachyos/mkCachyKernel.nix +++ b/kernel-cachyos/mkCachyKernel.nix @@ -54,11 +54,6 @@ lib.makeOverridable ( # Additional args are passed to buildLinux. ... }@args: - assert lib.assertOneOf "LTO Valid Options" lto [ - "none" - "thin" - "full" - ]; let helpers = callPackage ../helpers.nix { }; inherit (helpers) stdenvLLVM ltoMakeflags; @@ -118,15 +113,12 @@ lib.makeOverridable ( OVERLAY_FS_XINO_AUTO = no; OVERLAY_FS_METACOPY = no; OVERLAY_FS_DEBUG = no; - - LTO_NONE = if lto == "none" then lib.kernel.yes else lib.kernel.no; - LTO_CLANG_THIN = if lto == "thin" then lib.kernel.yes else lib.kernel.no; - LTO_CLANG_FULL = if lto == "full" then lib.kernel.yes else lib.kernel.no; }) # Apply CachyOS specific settings // (lib.mapAttrs (_: lib.mkForce) ( cachySettings.common + // (cachySettings.lto."${lto}") // (lib.optionalAttrs (cpusched != null) cachySettings.cpusched."${cpusched}") // (lib.optionalAttrs kcfi cachySettings.kcfi) // (lib.optionalAttrs (hzTicks != null) cachySettings.hzTicks."${hzTicks}")