Minor code move
Restore cross-compilation in 'make check'