Attempt to fix ARM builds by re-enabling make-4, but only for ARM.