Update make to the latest version & include linux headers in i686 links