Fix a bug when trunk is configured with --without-hwloc v1.8 is safe so no cmr This commit was SVN r31957.