From 2fe2dca986faca98ad76660a2a026ebdca93d6c4 Mon Sep 17 00:00:00 2001
From: "Jayesh Badwaik (FZ Juelich)" <j.badwaik@fz-juelich.de>
Date: Fri, 15 Sep 2023 22:09:47 +0200
Subject: [PATCH] - dev : set compiler only when toolchain is not specified

---
 dev/bin/generate.toolchain | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/dev/bin/generate.toolchain b/dev/bin/generate.toolchain
index 632a950..766306c 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
 
-- 
GitLab