Fixes #3792: Move without-hwloc fix to v1.7

---svn-pre-commit-ignore-below---

r28769 [[BR]]
fix --without-hwloc build failure

All builds since r28682 configured with '--without-hwloc' fail at "make"
time without this fix.

Reviewed by rhc@