Fix and refactor crossbuild target config
Merge pull request #1283 from kyab/crossbuild_fix

Fix and refactor crossbuild target config