Try but fail to fix build on gcc-based archs. The changes are necessary but
insufficient. At least the failure is now consistent across tier-2. This
change should have no effect on clang-based archs.

Approved by: portmgr (tier-2 blanket)