the build on -CURRENT. This restores Makefile sanity and diff clarity with r357486. (Fixing the build without GCC would be attempted separately.)