Makefile.in: Using current $CC in dmtcp/config.log?

Author: gc00

Makefile.in

@@ -42,7 +42,17 @@ DMTCP_ROOT ?= $(top_builddir)/dmtcp
 # Macros TEST and XTERM_E used on command line by check1, check2, ...:
 #   make TEST=readline XTERM_E="xterm -e" check-readline
 
+# MANA configure does configure DMTCP.  But no re-make in DMTCP.  Check ${CC}.
 default: display-build-env add-git-hooks mana_prereqs
+	@ cc_version="$$(${CC} --version | head -1 | tr -d '\n')" ; \
+	  if test ! -e dmtcp/bin/dmtcp_coordinator || \
+	     test ! -e dmtcp/config.log || \
+	     ! grep --quiet $${cc_version} dmtcp/config.log; then \
+	    echo "** DMTCP: not present, or else compiler version"; \
+	    echo "     is not current: ${cc_version}"; \
+	    echo "** Doing 'make' in dmtcp subdirectory."; \
+	    $(MAKE) dmtcp; \
+	  fi
 	$(MAKE) mana
 
 all: default
@@ -82,14 +92,23 @@ distclean: clean
 	rm -rf $(top_builddir)/lib
 	- cd $(top_builddir)/bin && find . \! -name '*mana*' -delete
 
+# MANA configure does configure DMTCP and 'make'; but doen't do a 'clean'.
+# Fix this in case a previous 'make' used a different ${CC} version.
+clean: tidy
+	@ cc_version="$$(${CC} --version | head -1 | tr -d '\n')" ; \
+	  if test ! -e dmtcp/config.log || \
+             ! grep --quiet $${cc_version} dmtcp/config.log; then \
+	    echo "** DMTCP: compiler version is not current: ${cc_version}"; \
+            echo "** Doing 'make clean' in dmtcp subdirectory."; \
+	-   cd ${DMTCP_ROOT} && $(MAKE) clean; \
+	  fi
+	cd mpi-proxy-split && $(MAKE) clean
+
 tidy:
 	rm -rf ckpt_rank*
 	rm -f ckpt_*.dmtcp dmtcp_restart_script*
 	rm -f dmtcp_coordinator_db-*.json
 
-clean: tidy
-	cd mpi-proxy-split && $(MAKE) clean
-
 mana_prereqs:
 	@ if test -n "$$HUGETLB_DEFAULT_PAGE_SIZE"; then \
 	  echo '** Env. var. HUGETLB_DEFAULT_PAGE_SIZE detected.'; \