[PATCH 4/6] Adjust compiler flag variables