Fixing the conda-gcc-cuda builds (#2305)
* Fixing mistakes in earlier PR
* Allowing cuda builds of different gccs
diff --git a/conda/cuda/build.sh b/conda/cuda/build.sh
index 333a90a..0946d1d 100755
--- a/conda/cuda/build.sh
+++ b/conda/cuda/build.sh
@@ -42,7 +42,7 @@
mkdir -p build
cd build
-cmake "${CMAKE_ARGS[@]}" $CONDA_CMAKE_ARGS $PYTHON_ARGS ..
+cmake "${CMAKE_ARGS[@]}" $CONDA_CMAKE_BUILD_ARGS $PYTHON_ARGS ..
make "-j$(nproc)"
make install/fast
diff --git a/docker/jenkins/ubuntu-cuda/Dockerfile b/docker/jenkins/ubuntu-cuda/Dockerfile
index f3e59e1..f09e4e8 100644
--- a/docker/jenkins/ubuntu-cuda/Dockerfile
+++ b/docker/jenkins/ubuntu-cuda/Dockerfile
@@ -13,6 +13,12 @@
ADD ./install_ccache.sh install_ccache.sh
RUN bash ./install_ccache.sh && rm install_ccache.sh
+# (optional) Install non-default GCC version
+ARG GCC_VERSION
+ADD ./install_gcc.sh install_gcc.sh
+RUN if [ -n "${GCC_VERSION}" ]; then bash ./install_gcc.sh; fi
+RUN rm install_gcc.sh
+
# Install NCCL for all CUDA builds
ARG UBUNTU_VERSION
ARG CUDA_VERSION
diff --git a/scripts/build_anaconda.sh b/scripts/build_anaconda.sh
index 7e52ee8..940f8aa 100755
--- a/scripts/build_anaconda.sh
+++ b/scripts/build_anaconda.sh
@@ -101,7 +101,7 @@
# and manually set the package name ourself.
CAFFE2_PACKAGE_NAME="${CAFFE2_PACKAGE_NAME}-cuda${CAFFE2_CUDA_VERSION}-cudnn${CAFFE2_CUDNN_VERSION}"
fi
-if [[ -z GCC_USE_C11 ]]; then
+if [[ $GCC_USE_C11 -eq 0 ]]; then
# gcc compatibility is not tracked by conda-forge, so we track it ourselves
CAFFE2_PACKAGE_NAME="${CAFFE2_PACKAGE_NAME}-gcc${GCC_VERSION:0:3}"
fi
