Introduce configuration variable TOOLCHAIN_CONFIG

... to pass along toolchain settings for current and future
toolchain definitions. Configuration variable
COMPILER_FAMILY is replaced by TOOLCHAIN_CONFIG["FAMILY"].

1 files changed, 10 insertions, 21 deletions

diff --git a/TARGETS b/TARGETS
index 88465547..7dc8e547 100644
--- a/TARGETS
+++ b/TARGETS
@@ -10,7 +10,6 @@
     , "BUILD_STATIC_BINARY"
     , "FINAL_LDFLAGS"
     , "CC"
-    , "COMPILER_FAMILY"
     , "CXX"
     , "DEBUG"
     , "ENV"
@@ -18,6 +17,7 @@
     , "OS"
     , "SOURCE_DATE_EPOCH"
     , "TARGET_ARCH"
+    , "TOOLCHAIN_CONFIG"
     , "VERSION_EXTRA_SUFFIX"
     , "PKG_CONFIG_ARGS"
     ]
@@ -30,9 +30,10 @@
     , "HOST_ARCH":
       ["The architecture on which the build actions are carried out."]
     , "TARGET_ARCH": ["The architecture for which to build the binary."]
-    , "COMPILER_FAMILY":
-      [ "The compiler family to use as (cross) toolchain."
+    , "TOOLCHAIN_CONFIG":
+      [ "The toolchain configuration."
       , ""
+      , "Use field \"FAMILY\" to specify the compiler family."
       , "Supported values are \"unknown\" (the default), \"clang\", and \"gnu\"."
       , "The unknown compiler family tries to not make any assumptions on the"
       , "used C and C++ compilers and uses the generic \"cc\" and \"c++\" as"
@@ -77,7 +78,7 @@
     , "HOST_ARCH"
     , "TARGET_ARCH"
     , "DEBUG"
-    , "COMPILER_FAMILY"
+    , "TOOLCHAIN_CONFIG"
     , "CC"
     , "CXX"
     , "ADD_CXXFLAGS"
@@ -93,8 +94,7 @@
   }
 , "just":
   { "type": "configure"
-  , "arguments_config":
-    ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "COMPILER_FAMILY"]
+  , "arguments_config": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH"]
   , "target": "exported-just"
   , "config":
     { "type": "let*"
@@ -113,14 +113,9 @@
           , "default": {"type": "var", "name": "ARCH"}
           }
         ]
-      , [ "COMPILER_FAMILY"
-        , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"}
-        ]
       ]
     , "body":
-      { "type": "env"
-      , "vars": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "COMPILER_FAMILY"]
-      }
+      {"type": "env", "vars": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH"]}
     }
   }
 , "installed just-mr":
@@ -134,7 +129,7 @@
     , "HOST_ARCH"
     , "TARGET_ARCH"
     , "DEBUG"
-    , "COMPILER_FAMILY"
+    , "TOOLCHAIN_CONFIG"
     , "CC"
     , "CXX"
     , "ADD_CXXFLAGS"
@@ -149,8 +144,7 @@
   }
 , "just-mr":
   { "type": "configure"
-  , "arguments_config":
-    ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "COMPILER_FAMILY"]
+  , "arguments_config": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH"]
   , "target": "exported-just-mr"
   , "config":
     { "type": "let*"
@@ -169,14 +163,9 @@
           , "default": {"type": "var", "name": "ARCH"}
           }
         ]
-      , [ "COMPILER_FAMILY"
-        , {"type": "var", "name": "COMPILER_FAMILY", "default": "clang"}
-        ]
       ]
     , "body":
-      { "type": "env"
-      , "vars": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "COMPILER_FAMILY"]
-      }
+      {"type": "env", "vars": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH"]}
     }
   }
 , "libgit2":