FS-6015: --resolve sqlite cross compile fixes