Fix #1357: Cross version suffix takes binaryEmitted version
Merge pull request #1358 from gzm0/binary-cross-version

Fix #1357: Cross version suffix takes binaryEmitted version