From 7162cafdf5a57ddb9e49dedc4755ce0ce685109f Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Tue, 10 Jan 2017 14:46:30 -0700 Subject: [PATCH] Squelching output from Makefile --- lib/kokkos/Makefile.kokkos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kokkos/Makefile.kokkos b/lib/kokkos/Makefile.kokkos index 65737ed580..038c252cf0 100644 --- a/lib/kokkos/Makefile.kokkos +++ b/lib/kokkos/Makefile.kokkos @@ -78,10 +78,10 @@ KOKKOS_INTERNAL_COMPILER_PGI := $(shell $(CXX) --version 2>&1 | grep PG KOKKOS_INTERNAL_COMPILER_XL := $(shell $(CXX) -qversion 2>&1 | grep XL | wc -l) KOKKOS_INTERNAL_COMPILER_CRAY := $(shell $(CXX) -craype-verbose 2>&1 | grep "CC-" | wc -l) KOKKOS_INTERNAL_COMPILER_NVCC := $(shell $(CXX) --version 2>&1 | grep "nvcc" | wc -l) -ifneq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1) +ifneq ($(OMPI_CXX),) KOKKOS_INTERNAL_COMPILER_NVCC := $(shell $(OMPI_CXX) --version 2>&1 | grep "nvcc" | wc -l) endif -ifneq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1) +ifneq ($(MPICH_CXX),) KOKKOS_INTERNAL_COMPILER_NVCC := $(shell $(MPICH_CXX) --version 2>&1 | grep "nvcc" | wc -l) endif KOKKOS_INTERNAL_COMPILER_CLANG := $(shell $(CXX) --version 2>&1 | grep "clang" | wc -l)