From 32b6d36f54938c481fd09727d32754d4d1326281 Mon Sep 17 00:00:00 2001 From: John Bute Date: Wed, 26 Nov 2025 13:01:36 -0500 Subject: [PATCH 1/2] fixed verbosity causing rebuild issue --- Sources/SWBCore/BuildParameters.swift | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Sources/SWBCore/BuildParameters.swift b/Sources/SWBCore/BuildParameters.swift index 8b8fced8..55938f37 100644 --- a/Sources/SWBCore/BuildParameters.swift +++ b/Sources/SWBCore/BuildParameters.swift @@ -191,7 +191,7 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable { try container.encodeIfPresent(activeRunDestination, forKey: .activeRunDestination) try container.encodeIfPresent(activeArchitecture, forKey: .activeArchitecture) try container.encodeIfPresent(arena, forKey: .arena) - try container.encode(overrides, forKey: .overrides) + try container.encode(normalizedOverrides(overrides), forKey: .overrides) try container.encode(commandLineOverrides, forKey: .commandLineOverrides) try container.encodeIfPresent(commandLineConfigOverridesPath, forKey: .commandLineConfigOverridesPath) try container.encode(commandLineConfigOverrides, forKey: .commandLineConfigOverrides) @@ -228,7 +228,7 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable { hasher.combine(activeRunDestination) hasher.combine(activeArchitecture) hasher.combine(arena) - hasher.combine(overrides) + hasher.combine(normalizedOverrides(overrides)) hasher.combine(commandLineOverrides) hasher.combine(commandLineConfigOverridesPath) hasher.combine(commandLineConfigOverrides) @@ -237,6 +237,15 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable { hasher.combine(toolchainOverride) return hasher.finalize() } + + private func normalizedOverrides(_ overrides: [String: String]) -> [String: String] { + overrides.mapValues { value in + // Remove -v flag from the value to avoid rebuild + value.split(separator: " ") + .filter { $0 != "-v" } + .joined(separator: " ") + } + } } extension BuildParameters { From 53d3d1208216d5daa738871c681bb32c04bdd5aa Mon Sep 17 00:00:00 2001 From: John Bute Date: Wed, 26 Nov 2025 13:03:58 -0500 Subject: [PATCH 2/2] changed for added clarity --- Sources/SWBCore/BuildParameters.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/SWBCore/BuildParameters.swift b/Sources/SWBCore/BuildParameters.swift index 55938f37..e3685da3 100644 --- a/Sources/SWBCore/BuildParameters.swift +++ b/Sources/SWBCore/BuildParameters.swift @@ -191,7 +191,7 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable { try container.encodeIfPresent(activeRunDestination, forKey: .activeRunDestination) try container.encodeIfPresent(activeArchitecture, forKey: .activeArchitecture) try container.encodeIfPresent(arena, forKey: .arena) - try container.encode(normalizedOverrides(overrides), forKey: .overrides) + try container.encode(filterOverrides(overrides), forKey: .overrides) try container.encode(commandLineOverrides, forKey: .commandLineOverrides) try container.encodeIfPresent(commandLineConfigOverridesPath, forKey: .commandLineConfigOverridesPath) try container.encode(commandLineConfigOverrides, forKey: .commandLineConfigOverrides) @@ -228,7 +228,7 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable { hasher.combine(activeRunDestination) hasher.combine(activeArchitecture) hasher.combine(arena) - hasher.combine(normalizedOverrides(overrides)) + hasher.combine(filterOverrides(overrides)) hasher.combine(commandLineOverrides) hasher.combine(commandLineConfigOverridesPath) hasher.combine(commandLineConfigOverrides) @@ -238,7 +238,7 @@ public struct BuildParameters: Hashable, SerializableCodable, Sendable { return hasher.finalize() } - private func normalizedOverrides(_ overrides: [String: String]) -> [String: String] { + private func filterOverrides(_ overrides: [String: String]) -> [String: String] { overrides.mapValues { value in // Remove -v flag from the value to avoid rebuild value.split(separator: " ")