Patch to use --tag=CC.  Fixes #497