Remove CUDA_LDFLAGS from CFLAGS (#49)

automerged PR by conda-forge/automerge-action
conda-forge · Oct 28, 2024 · 2acb577 · 2acb577
2 parents b357547 + 8a5a3a6
commit 2acb577
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 52 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/recipe/activate.sh b/recipe/activate.sh
@@ -25,9 +25,9 @@ else
     CUDA_LDFLAGS="${CUDA_LDFLAGS} -L${CONDA_PREFIX}/${targetsDir}/lib"
     CUDA_LDFLAGS="${CUDA_LDFLAGS} -L${CONDA_PREFIX}/${targetsDir}/lib/stubs"
 fi
-export CFLAGS="${CFLAGS} ${CUDA_CFLAGS} ${CUDA_LDFLAGS}"
-export CPPFLAGS="${CPPFLAGS} ${CUDA_CFLAGS} ${CUDA_LDFLAGS}"
-export CXXFLAGS="${CXXFLAGS} ${CUDA_CFLAGS} ${CUDA_LDFLAGS}"
+export CFLAGS="${CFLAGS} ${CUDA_CFLAGS}"
+export CPPFLAGS="${CPPFLAGS} ${CUDA_CFLAGS}"
+export CXXFLAGS="${CXXFLAGS} ${CUDA_CFLAGS}"
 export LDFLAGS="${LDFLAGS} ${CUDA_LDFLAGS}"
 
 if [ -z "${CXX+x}" ]; then

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,7 +14,7 @@ source:
   sha256: e2c71babfd18a8e69542dd7e9ca018f9caa438094001a58e6bc4d8c999bf0d07
 
 build:
-  number: 0
+  number: 1
   skip: true  # [osx or ppc64le]
   skip: true  # [target_platform != "linux-64" and target_platform != cross_target_platform]
 

diff --git a/recipe/run_nvcc_tests.sh b/recipe/run_nvcc_tests.sh
@@ -27,7 +27,7 @@ cmake_version=$(cmake --version | grep version | awk '{print $3}')
 
 nvcc --version
 
-$CXX --verbose ${CXXFLAGS} -lcuda -lcudart_static test.cpp
+$CXX --verbose ${CXXFLAGS} test.cpp ${LDFLAGS} -lcuda -lcudart_static
 
 nvcc --verbose test.cu