Move x86 to x86-linux
Change arch build setup