Log Message:
Respect CFLAGS in a more conservative way. This preserves the ability
to build Universal on Mac OS X, and may undo the Solaris breakage
caused by the previous commit (reported in PR pkg/36408 and on
pkgsrc-users@).