presets: Fix two issues with build presets
Fixes: #22272 (closed), #22273 (closed)
Backport: release:HEAD^2
Topic-rename: presets-build-fixes
Edited by Brad King
Fixes: #22272 (closed), #22273 (closed)
Backport: release:HEAD^2
Topic-rename: presets-build-fixes