Merge pull request #22587 from jefferyto/psqlodbc-fix-build