From 2f798500ede2bf4a4affb3c1ff72ebd3f211b4d8 Mon Sep 17 00:00:00 2001
From: Ludovic Henry <git@ludovic.dev>
Date: Tue, 9 Apr 2024 14:02:08 +0000
Subject: [PATCH] fixup! Enable GCC 9 explicitly

---
 .github/workflows/linux-build.yml | 2 +-
 Makefile                          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 197389de778d..36baeb148358 100644
--- 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
index 1396c7294270..f06017e3e391 100644
--- 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)