From 16d901c576bbfda339848bc1dd83f3776a6d61bf Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Wed, 30 Oct 2024 10:25:30 +0100
Subject: Simplify logic of INCLUDE_LINTER lookup in clang-18

---
 src/compilers/clang-18-native.TARGETS | 39 ++++++++++-------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/compilers/clang-18-native.TARGETS b/src/compilers/clang-18-native.TARGETS
index ee433f7..c4eef3c 100644
--- a/src/compilers/clang-18-native.TARGETS
+++ b/src/compilers/clang-18-native.TARGETS
@@ -151,35 +151,18 @@
         , "-DLLVM_INCLUDE_DOCS=OFF"
         , "-DLLVM_INCLUDE_TESTS=OFF"
         , "-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON"
-        , { "type": "join"
-          , "$1":
-            [ "-DLLVM_ENABLE_PROJECTS="
-            , { "type": "join_cmd"
-              , "$1":
-                [ { "type": "join"
-                  , "separator": ";"
-                  , "$1":
-                    { "type": "++"
-                    , "$1":
-                      [ ["clang"]
-                      , { "type": "if"
-                        , "cond":
-                          { "type": "lookup"
-                          , "key": "INCLUDE_LINTER"
-                          , "map":
-                            { "type": "var"
-                            , "name": "TOOLCHAIN_CONFIG"
-                            , "default": {"type": "empty_map"}
-                            }
-                          }
-                        , "then": ["clang-tools-extra"]
-                        }
-                      ]
-                    }
-                  }
-                ]
+        , { "type": "if"
+          , "cond":
+            { "type": "lookup"
+            , "key": "INCLUDE_LINTER"
+            , "map":
+              { "type": "var"
+              , "name": "TOOLCHAIN_CONFIG"
+              , "default": {"type": "empty_map"}
               }
-            ]
+            }
+          , "then": "-DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra'"
+          , "else": "-DLLVM_ENABLE_PROJECTS=clang"
           }
         , "-DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi;libunwind'"
         , "-DLLVM_TARGETS_TO_BUILD=X86"
-- 
cgit v1.2.3