diff --git a/dev/bin/generate.toolchain b/dev/bin/generate.toolchain
index 632a950655bf957c184d20b356845256ad2a54c4..766306cab41c9c0125678e7dd97ceb53c5bff8bb 100755
--- a/dev/bin/generate.toolchain
+++ b/dev/bin/generate.toolchain
@@ -169,17 +169,22 @@ echo "# 4. Standard : $STD" >> $SITE_TOOLCHAIN_FILE
 echo "" >> $SITE_TOOLCHAIN_FILE
 
 
-case $PLATFORM in
-  x64.nvhpc.23 )
-    echo "set(CMAKE_CXX_COMPILER nvc++)" >> $SITE_TOOLCHAIN_FILE
-    echo "set(CMAKE_C_COMPILER nvc)" >> $SITE_TOOLCHAIN_FILE
-    echo "set(CMAKE_CUDA_FLAGS_INIT "-extended-lambda")" >> $SITE_TOOLCHAIN_FILE
-    ;;
-  x64.llvm.15)
-    echo "set(CMAKE_CXX_COMPILER clang++)" >> $SITE_TOOLCHAIN_FILE
-    echo "set(CMAKE_C_COMPILER clang)" >> $SITE_TOOLCHAIN_FILE
-    ;;
-esac
+if [[ $TOOLCHAIN_SPECIFIED == "true" ]]; then
+  TOOLCHAIN=$(realpath $TOOLCHAIN)
+  echo "include($TOOLCHAIN)" >> $SITE_TOOLCHAIN_FILE
+else
+  case $PLATFORM in
+    x64.nvhpc.23 )
+      echo "set(CMAKE_CXX_COMPILER nvc++)" >> $SITE_TOOLCHAIN_FILE
+      echo "set(CMAKE_C_COMPILER nvc)" >> $SITE_TOOLCHAIN_FILE
+      echo "set(CMAKE_CUDA_FLAGS_INIT "-extended-lambda")" >> $SITE_TOOLCHAIN_FILE
+      ;;
+    x64.llvm.15 | x64.llvm.16)
+      echo "set(CMAKE_CXX_COMPILER clang++)" >> $SITE_TOOLCHAIN_FILE
+      echo "set(CMAKE_C_COMPILER clang)" >> $SITE_TOOLCHAIN_FILE
+      ;;
+  esac
+fi
 
 echo "list(APPEND CMAKE_SYSTEM_PREFIX_PATH $PKGROOT/usr)" >> $SITE_TOOLCHAIN_FILE
 echo "set(CMAKE_CXX_STANDARD $STDPROFILE_CXX_STD)" >> $SITE_TOOLCHAIN_FILE
@@ -196,10 +201,6 @@ echo "set(CMAKE_CUDA_EXTENSIONS  OFF)" >> $SITE_TOOLCHAIN_FILE
 echo "set(CMAKE_HIP_EXTENSIONS   OFF)" >> $SITE_TOOLCHAIN_FILE
 
 
-if [[ $TOOLCHAIN_SPECIFIED == "true" ]]; then
-  TOOLCHAIN=$(realpath $TOOLCHAIN)
-  echo "include($TOOLCHAIN)" >> $SITE_TOOLCHAIN_FILE
-fi
 
 BASH_SOURCE_FILE=$PKGROOT/srv/toolchain/bash/toolchain.bash