Replace static linking hack with patch
    
    Replace the manual static linking with the patch from
    https://reviews.llvm.org/D134644, to make it clear that this can
    be dropped with the LLVM 16 upgrade.
    
    We no longer use the system-libcxxabi option, so the incorrect
    option handling was the only issue here.