Rollup merge of #110917 - Be-ing:whole_archive_with_staticlib_fix, r=…

…petrochenkov

only error combining +whole-archive and +bundle for rlibs

Fixes rust-lang/rust#110912

Checking `flavor == RlibFlavor::Normal` was accidentally lost in 601fc8b36b1962285e371cf3c54eeb3b1b9b3a74
rust-lang/rust#105601

That caused combining +whole-archive and +bundle link modifiers on non-rlib crates to fail with a confusing error message saying that combination is unstable for rlibs. In particular, this caused the build to fail when +whole-archive was used on staticlib crates, even though +whole-archive effectively does nothing on non-bin crates because the final linker invocation is left to an external build system.

cc ``@petrochenkov``