NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-09-11 12:05:26 +03:00
Code Issues Projects Releases Wiki Activity

kernel/builder: Ignore more toolchain information in config

Browse Source
This commit is contained in:
Samuel Dionne-Riel 2023-03-19 17:18:16 -04:00
parent a331f48178
commit 17d7a0ccf4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
overlay/mobile-nixos/kernel/builder.nix
View File

@ -347,28 +347,41 @@ stdenv.mkDerivation (inputArgs // {
make $makeFlags "''${makeFlagsArray[@]}" oldconfig
if [ -n "$forceNormalizedConfig" ]; then
if [ -e $buildRoot/.config.old ]; then
# First we strip options that save the exact compiler version.
# First we strip options that save the exact compiler version,
# and toolchain information.
# This is first because it will break with cross-compilation.
# It also will break on minor version bumps.
# We do not strip options related to compiler features, since
# compiler features changing is something we want to track, I think.
(
cd $buildRoot
for f in .config{,.old}; do
sed \
${concatMapStringsSep " \\\n" (token: "-e '/${token}/d;'") [
# Keep this sorted
"CONFIG_ARCH_SUPPORTS_.*"
"CONFIG_ARCH_USES_HIGH_VMA_FLAGS"
"CONFIG_ARM64_AS_HAS_MTE"
"CONFIG_ARM64_BTI_KERNEL"
"CONFIG_ARM64_MTE"
"CONFIG_ARM64_PTR_AUTH"
"CONFIG_AS_HAS_CFI_NEGATE_RA_STATE"
"CONFIG_AS_VERSION"
"CONFIG_CC_HAS_.*"
"CONFIG_CC_HAVE_.*"
"CONFIG_CC_NO_ARRAY_BOUNDS"
"CONFIG_CC_VERSION_TEXT"
"CONFIG_CLANG_VERSION"
"CONFIG_DEBUG_INFO_SPLIT"
"CONFIG_GCC_PLUGINS"
"CONFIG_GCC_PLUGIN_.*"
"CONFIG_GCC_VERSION"
"CONFIG_HAVE_.*"
"CONFIG_INIT_STACK_ALL_PATTERN"
"CONFIG_INIT_STACK_ALL_ZERO"
"CONFIG_KCOV"
"CONFIG_KCSAN"
"CONFIG_LD_VERSION"
"CONFIG_SHADOW_CALL_STACK"
"CONFIG_ZERO_CALL_USED_REGS"
]} \
$f > .tmp$f
done