Merge pull request #22 from robertmaynard/bug/use_nvcc_append_flags_f…

…or_includes_and_link_dirs

Move implicit include and link dirs to end of compile line.

recipe/activate.sh

@@ -36,15 +36,24 @@ else
  export NVCC_PREPEND_FLAGS_BACKUP="${NVCC_PREPEND_FLAGS}"
  fi
  NVCC_PREPEND_FLAGS="${NVCC_PREPEND_FLAGS} -ccbin=${CXX}"
+ export NVCC_PREPEND_FLAGS
+
+ if [[ ! -z "${NVCC_APPEND_FLAGS+x}" ]]
+ then
+ export NVCC_APPEND_FLAGS_BACKUP="${NVCC_APPEND_FLAGS}"
+ fi
  # For conda-build we add the host requirements prefix to the include- and
  # link-paths for nvcc because it is separate from the build prefix where
- # nvcc is installed.
+ # nvcc is installed. We do this using `NVCC_APPEND_FLAGS` so that it
+ # goes last on the compiler/link line. This ensures that these flags
+ # match the behavior of the other implicit flags of the compiler, allowing
+ # for user overrides.
  if [ "${CONDA_BUILD:-0}" = "1" ]; then
- NVCC_PREPEND_FLAGS="${NVCC_PREPEND_FLAGS} -I${PREFIX}/${targetsDir}/include"
- NVCC_PREPEND_FLAGS="${NVCC_PREPEND_FLAGS} -L${PREFIX}/${targetsDir}/lib"
- NVCC_PREPEND_FLAGS="${NVCC_PREPEND_FLAGS} -L${PREFIX}/${targetsDir}/lib/stubs"
+ NVCC_APPEND_FLAGS="${NVCC_APPEND_FLAGS} -I${PREFIX}/${targetsDir}/include"
+ NVCC_APPEND_FLAGS="${NVCC_APPEND_FLAGS} -L${PREFIX}/${targetsDir}/lib"
+ NVCC_APPEND_FLAGS="${NVCC_APPEND_FLAGS} -L${PREFIX}/${targetsDir}/lib/stubs"
  fi
- export NVCC_PREPEND_FLAGS
+ export NVCC_APPEND_FLAGS
 fi
 
 # Exit with unclean status if there was an error

recipe/deactivate.sh

@@ -5,3 +5,9 @@ then
  export NVCC_PREPEND_FLAGS="${NVCC_PREPEND_FLAGS_BACKUP}"
  unset NVCC_PREPEND_FLAGS_BACKUP
 fi
+
+if [[ ! -z "${NVCC_APPEND_FLAGS_BACKUP+x}" ]]
+then
+ export NVCC_PREPEND_FLAGS="${NVCC_APPEND_FLAGS_BACKUP}"
+ unset NVCC_APPEND_FLAGS_BACKUP
+fi

recipe/meta.yaml

@@ -12,7 +12,7 @@ source:
  sha256: 5db25d4fd138013b563f9a3d1d87f7de7df1dac014fd4cccdfbb3435a5cff761
 
 build:
- number: 7
+ number: 8
  skip: true # [osx or win]
  skip: true # [target_platform != "linux-64" and target_platform != cross_target_platform]