fixup! Enable GCC 9 explicitly

rivosinc · Apr 9, 2024 · 2f79850 · 2f79850
1 parent 6e5bdcc
commit 2f79850
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -91,7 +91,7 @@ jobs:
           CUDA_ARCHITECTURES: 60
           CUDA_COMPILER: /usr/local/cuda-${CUDA_VERSION}/bin/nvcc
           # Without that, nvcc picks /usr/bin/c++ which is GCC 8
-          CMAKE_CUDA_FLAGS: "-ccbin /opt/rh/gcc-toolset-9/root/usr/bin"
+          CUDA_FLAGS: "-ccbin /opt/rh/gcc-toolset-9/root/usr/bin"
         run: |
           EXTRA_CMAKE_FLAGS=(
             "-DVELOX_ENABLE_BENCHMARKS=ON"

diff --git a/Makefile b/Makefile
@@ -58,6 +58,10 @@ ifdef CUDA_COMPILER
 CMAKE_FLAGS += -DCMAKE_CUDA_COMPILER="$(CUDA_COMPILER)"
 endif
 
+ifdef CUDA_FLAGS
+CMAKE_FLAGS += -DCMAKE_CUDA_FLAGS="$(CUDA_FLAGS)"
+endif
+
 # Use Ninja if available. If Ninja is used, pass through parallelism control flags.
 USE_NINJA ?= 1
 ifeq ($(USE_NINJA), 1)