From a8b5feb1985a043bd94dc06e27114c383c30d1e1 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Thu, 27 Jun 2024 11:22:18 +0200
Subject: Production stages: use ["shell", "cmds"]

... instead of generic to support bringing in a toolchain.
---
 src/compilers/clang-17-native.TARGETS | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'src/compilers/clang-17-native.TARGETS')

diff --git a/src/compilers/clang-17-native.TARGETS b/src/compilers/clang-17-native.TARGETS
index 6b268e6..8d3ebda 100644
--- a/src/compilers/clang-17-native.TARGETS
+++ b/src/compilers/clang-17-native.TARGETS
@@ -186,43 +186,33 @@
   , "lib": ["libatomic_files"]
   }
 , "libstdc++_files":
-  { "type": "generic"
-  , "arguments_config": ["ENV"]
+  { "type": ["@", "rules", "shell", "cmds"]
   , "deps": ["toolchain"]
   , "cmds": ["cp -L lib64/libstdc++.so.6 ."]
   , "outs": ["libstdc++.so.6"]
-  , "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
   }
 , "libc++_files":
-  { "type": "generic"
-  , "arguments_config": ["ENV"]
+  { "type": ["@", "rules", "shell", "cmds"]
   , "deps": ["toolchain"]
   , "cmds": ["cp -L lib/$(./bin/clang -dumpmachine)/libc++.so.1 ."]
   , "outs": ["libc++.so.1"]
-  , "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
   }
 , "libc++abi_files":
-  { "type": "generic"
-  , "arguments_config": ["ENV"]
+  { "type": ["@", "rules", "shell", "cmds"]
   , "deps": ["toolchain"]
   , "cmds": ["cp -L lib/$(./bin/clang -dumpmachine)/libc++abi.so.1 ."]
   , "outs": ["libc++abi.so.1"]
-  , "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
   }
 , "libgcc_s_files":
-  { "type": "generic"
-  , "arguments_config": ["ENV"]
+  { "type": ["@", "rules", "shell", "cmds"]
   , "deps": ["toolchain"]
   , "cmds": ["cp -L lib64/libgcc_s.so.1 ."]
   , "outs": ["libgcc_s.so.1"]
-  , "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
   }
 , "libatomic_files":
-  { "type": "generic"
-  , "arguments_config": ["ENV"]
+  { "type": ["@", "rules", "shell", "cmds"]
   , "deps": ["toolchain"]
   , "cmds": ["cp -L lib64/libatomic.so.1 ."]
   , "outs": ["libatomic.so.1"]
-  , "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
   }
 }
-- 
cgit v1.2.3