From 3bb7427d35211065365783dc4d2d5f5dd9cce0ce Mon Sep 17 00:00:00 2001 From: Michael Bentley Date: Thu, 17 May 2018 14:31:44 -0600 Subject: [PATCH] Fix Makefile bug that was introduced today --- data/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/Makefile.in b/data/Makefile.in index aa2a5886..e11d5d10 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -177,7 +177,10 @@ INTEL := icpc GCC := g++ ifdef CLANG_ONLY -COMPILERS = CLANG +COMPILERS := CLANG +else +COMPILERS := $(foreach c, GCC INTEL CLANG, \ + $(if $(shell which $($(c)) 2>/dev/null), $c,)) endif HOSTNAME := $(shell hostname) @@ -338,8 +341,6 @@ R_TARGET := $(RESULTS_DIR)/$(R_ID) R_OBJ := $(addprefix $(OBJ_DIR)/,$(notdir $(SOURCE:%.cpp=%_$(R_ID).o))) R_DEP := $(R_OBJ:%.o=%.d) -$(info $(R_OBJ)) - -include $(R_DEP) .PHONY: rec