Backport gcc48-cc++ dep fix.