diff --git a/config/buildSettings.mk b/config/buildSettings.mk index a958de299a892946a94b6a63a52cad1d3041c35f..46c3cceed5a119d7464a04439ada0fe553cf6dd9 100644 --- a/config/buildSettings.mk +++ b/config/buildSettings.mk @@ -65,6 +65,9 @@ ARCHLIBS = # armadillo structures may have different byte-alignment # to equivalent g++-compiled structures (see # include/armadillo_bits/compiler_setup.hpp) +# +# - Set -std=c++14. This is the newest C++ standard +# supported by nvcc for CUDA<11.0. ARCHNVCCFLAGS = -DARMA_ALLOW_FAKE_GCC -std=c++14 # Linker flags for CUDA projects. @@ -197,10 +200,10 @@ ifneq (${NVCC}, ) # cublas_Lt_static, in addition to culibos ifeq ($(patsubst 9.%,,${CUDA_VER}),) CUBLAS_STATIC = -lcublas_static -lculibos - NVCCFLAGS += --cudart=static + NVCCLDFLAGS += --cudart=static else CUBLAS_STATIC = -lcublas_static -lcublasLt_static -lculibos - NVCCFLAGS += --cudart=static --cudadevrt=static + NVCCLDFLAGS += --cudart=static --cudadevrt=static endif # Other CUDA toolkit components will @@ -209,9 +212,9 @@ ifneq (${NVCC}, ) $(subst -lcurand,-lcurand_static,${CUDALIBS})) else ifeq ($(patsubst 9.%,,${CUDA_VER}),) - NVCCFLAGS += --cudart=shared + NVCLDCFLAGS += --cudart=shared else - NVCCFLAGS += --cudart=shared --cudadevrt=static + NVCCLDFLAGS += --cudart=shared --cudadevrt=static endif _CUDALIBS += ${CUDALIBS} endif