Rework build makefile macros for 32/64-bit host bootstrap