hwloc: Specify full set of compiler options to configure script (#3455)

Author: evan-charmworks

cmake/hwloc.cmake

@@ -33,8 +33,15 @@ ExternalProject_Add(hwloc
         --without-x \
         HWLOC_FLAGS=\"$CHARM_CC_FLAGS\" \
         CFLAGS=\"$CHARM_CC_FLAGS\" \
-        CC=$CHARM_CC \
-        CC_FOR_BUILD=$CHARM_CC \
+        CXXFLAGS=\"$CHARM_CXX_FLAGS\" \
+        CC=\"$CHARM_CC\" \
+        CXX=\"$CHARM_CXX\" \
+        CC_FOR_BUILD=\"$CHARM_CC\" \
+        CPP= \
+        CXXCPP= \
+        CPPFLAGS= \
+        LDFLAGS= \
+        LIBS= \
         > /dev/null"
     BUILD_COMMAND $(MAKE) V=$(VERBOSE) AUTOCONF=: AUTOHEADER=: AUTOMAKE=: ACLOCAL=:
     INSTALL_COMMAND cp -f ${CMAKE_BINARY_DIR}/hwloc-prefix/src/hwloc/include/hwloc.h ${CMAKE_BINARY_DIR}/include/

src/scripts/Makefile

@@ -500,8 +500,15 @@ hwloc-target: conv-autoconfig.h
     --without-x \
     HWLOC_FLAGS="$(HWLOC_CC_FLAGS)" \
     CFLAGS="$(HWLOC_CC_FLAGS)" \
+    CXXFLAGS="$(HWLOC_CXX_FLAGS)" \
     CC="$(HWLOC_CC)" \
+    CXX="$(HWLOC_CXX)" \
     CC_FOR_BUILD="$(HWLOC_CC)" \
+    CPP= \
+    CXXCPP= \
+    CPPFLAGS= \
+    LDFLAGS= \
+    LIBS= \
     > /dev/null || ( cat config.log ; exit 1 ) )
 	( $(MAKE) -C hwloc AUTOCONF=: AUTOHEADER=: AUTOMAKE=: ACLOCAL=: )
 	( cp -f hwloc/include/hwloc.h $(INC) )

src/scripts/configure.ac

@@ -2998,6 +2998,8 @@ fi
 
 eval `"$CHARMBIN/charmc" $OPTS -print-building-blocks -standalone`
 add_make_flag "HWLOC_CC:=$(get_full_command_name "$CHARM_CC")" "hwloc"
+add_make_flag "HWLOC_CXX:=$(get_full_command_name "$CHARM_CXX")" "hwloc"
 add_make_flag "HWLOC_CC_FLAGS:=$CHARM_CC_FLAGS" "hwloc"
+add_make_flag "HWLOC_CXX_FLAGS:=$CHARM_CXX_FLAGS" "hwloc"
 
 AC_OUTPUT