Added CPP_HW_ARCHITECTURE flag to settings