From 64a7a80e300c4d1e47094052dc5f1fd3455ffabf Mon Sep 17 00:00:00 2001 From: Pedro Mediano Date: Sat, 2 May 2020 14:37:27 +0100 Subject: [PATCH] Changed name of LDFLAGS to avoid potential conflicts Closes #80 . --- cuda/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cuda/Makefile b/cuda/Makefile index d48679d..a3c22d2 100644 --- a/cuda/Makefile +++ b/cuda/Makefile @@ -74,7 +74,7 @@ endif # Common includes and paths for CUDA. This assumes the CUDA toolkit is in PATH INCLUDES := -I. -I./cub -I${JNI_INCLUDE} -I${JNI_PLATFORM_INCLUDE} -LDFLAGS += -L. -L$(BIN) -lcuda -lcudart +NVCCLDFLAGS := -L. -L$(BIN) -lcuda -lcudart .PHONY: all clean test @@ -102,7 +102,7 @@ $(BIN)/%.o: %.c ## Final shared library linking #------------------------------ $(BIN)/libKraskov.so: $(BIN)/libgpuKnnLibrary.a $(c_objects) - ${NVCC} ${NVCCFLAGS} ${INCLUDES} -Xcompiler -fPIC -shared -o $@ $(c_objects) ${LDFLAGS} -lgpuKnnLibrary + ${NVCC} ${NVCCFLAGS} ${INCLUDES} -Xcompiler -fPIC -shared -o $@ $(c_objects) ${NVCCLDFLAGS} -lgpuKnnLibrary ## Test binary targets