From 92bdfc81114d683a1012c106f224136b0a135dc9 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Mon, 1 Jul 2024 12:41:05 +0200
Subject: ["CC/auto", "config"]: honor bin dirs of shell defaults

---
 CC/auto/RULES | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'CC/auto')

diff --git a/CC/auto/RULES b/CC/auto/RULES
index 65aca1c..debae9c 100644
--- a/CC/auto/RULES
+++ b/CC/auto/RULES
@@ -162,6 +162,7 @@
     , "default-TOOLCHAIN": ["./", "..", "default-TOOLCHAIN"]
     , "default-NON_SYSTEM_TOOLS": ["./", "..", "default-NON_SYSTEM_TOOLS"]
     , "map_provider": ["./", "../..", "field_map_provider"]
+    , "list_provider": ["./", "../..", "field_list_provider"]
     , "sh": ["./", "../../shell", "sh"]
     , "sh-PATH": ["./", "../../shell", "PATH"]
     }
@@ -241,6 +242,27 @@
           , "body": {"type": "CALL_EXPRESSION", "name": "sh"}
           }
         ]
+      , [ "bin dirs"
+        , { "type": "let*"
+          , "bindings":
+            [["fieldname", "shell defaults"], ["provider", "bin dirs"]]
+          , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+          }
+        ]
+      , [ "bin dirs"
+        , { "type": "foreach"
+          , "range": {"type": "var", "name": "bin dirs"}
+          , "body":
+            { "type": "join"
+            , "$1":
+              [ "./"
+              , {"type": "var", "name": "TOOLCHAIN_DIR"}
+              , "/"
+              , {"type": "var", "name": "_"}
+              ]
+            }
+          }
+        ]
       , [ "NON_SYSTEM_TOOLS"
         , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"}
         ]
@@ -283,6 +305,7 @@
                       , "bindings": [["fieldname", "shell defaults"]]
                       , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"}
                       }
+                    , {"type": "var", "name": "bin dirs"}
                     ]
                   }
                 }
-- 
cgit v1.2.3