[mpich2-commits] r5482 - in mpich2/trunk/src/pm/hydra/tools/bind: . hwloc

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-18 11:50:26 -0500 (Sun, 18 Oct 2009)
New Revision: 5482

Modified:
   mpich2/trunk/src/pm/hydra/tools/bind/bind.c
   mpich2/trunk/src/pm/hydra/tools/bind/hwloc/Makefile.mk
Log:
Fix a copy-paste error resulting in compilation failure when plpa is
not selected.

Build hwloc when its selected, instead of just configuring it.

Modified: mpich2/trunk/src/pm/hydra/tools/bind/bind.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/bind.c	2009-10-18 16:15:20 UTC (rev 5481)
+++ mpich2/trunk/src/pm/hydra/tools/bind/bind.c	2009-10-18 16:50:26 UTC (rev 5482)
@@ -171,7 +171,7 @@
 
 #if defined HAVE_HWLOC
     if (!strcmp(HYDT_bind_info.bindlib, "hwloc")) {
-        status = HYDT_bind_plpa_process(core);
+        status = HYDT_bind_hwloc_process(core);
         HYDU_ERR_POP(status, "HWLOC failure binding process to core\n");
     }
 #endif /* HAVE_HWLOC */

Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/Makefile.mk
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/Makefile.mk	2009-10-18 16:15:20 UTC (rev 5481)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/Makefile.mk	2009-10-18 16:50:26 UTC (rev 5482)
@@ -5,3 +5,5 @@
 #
 
 libhydra_a_SOURCES += $(top_srcdir)/tools/bind/hwloc/bind_hwloc.c
+
+SUBDIRS += tools/bind/hwloc/hwloc