more arch related makefile fixes