From a448d754beda5fb45a5983e643036ea4eb328d3e Mon Sep 17 00:00:00 2001 From: Andrew Boktor Date: Fri, 13 Feb 2015 15:14:38 -0800 Subject: [PATCH] Fixing the makefile for newer cuda/gcc --- WP/makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WP/makefile b/WP/makefile index 0a2e593..972dc5f 100644 --- a/WP/makefile +++ b/WP/makefile @@ -72,7 +72,7 @@ DEBUGOUTPUT = -DDEBUG_I=$(DEBUG_I) -DDEBUG_J=$(DEBUG_J) -DDEBUG_K=$(DEBUG_K) $(F NVCC = $(CUDA_INSTALL_PATH)/bin/nvcc -DCUDA #--ptxas-options=-v PHASE = -cuda --compiler-options -fno-strict-aliasing NVOPT = $(DEVICEEMU_NVCC) $(PROMOTE) $(DEBUGDEBUG) $(DEBUGOUTPUT) \ - -DXXX=$(XXX) -DYYY=$(YYY) -DMKX=$(MKX) --host-compilation 'C++' --use_fast_math + -DXXX=$(XXX) -DYYY=$(YYY) -DMKX=$(MKX) --use_fast_math ifeq ($(noinline),1) NVOPT += -Xopencc -noinline # Compiler-specific flags, when using noinline, we don't build for SM1x @@ -108,7 +108,7 @@ wsm5.f.cu : wsm5.cu wsm5.cu.o : wsm5.f.cu $(NVCC) $(PHASE) $(NVOPT) wsm5.f.cu - $(CC) $(CFLAGS) -o wsm5.cu.o -c wsm5.f.cu.cpp + $(CC) $(CFLAGS) -o wsm5.cu.o -c wsm5.f.cu.cpp.ii wsm5_gpu.f.cu : wsm5_gpu.cu spt.h @@ -116,7 +116,7 @@ wsm5_gpu.f.cu : wsm5_gpu.cu spt.h wsm5_gpu.cu.o : wsm5_gpu.f.cu $(NVCC) $(PHASE) $(NVOPT) wsm5_gpu.f.cu - $(CC) $(CFLAGS) -o wsm5_gpu.cu.o -c wsm5_gpu.f.cu.cpp + $(CC) $(CFLAGS) -o wsm5_gpu.cu.o -c wsm5_gpu.f.cu.cpp.ii libmassv.o : libmassv.F