1 files changed, 56 insertions, 64 deletions
diff --git a/etc/defaults/CC/TARGETS.git2 b/etc/defaults/CC/TARGETS.git2
index 056b745e..4326ce62 100644
--- a/etc/defaults/CC/TARGETS.git2
+++ b/etc/defaults/CC/TARGETS.git2
@@ -1,82 +1,74 @@
 { "defaults":
   { "type": ["CC", "defaults"]
-  , "arguments_config": ["OS", "ARCH"]
-  , "CC": ["clang"]
-  , "CXX": ["clang++"]
-  , "CFLAGS":
+  , "arguments_config": ["COMPILER_FAMILY", "OS"]
+  , "base": [["@", "base", "CC", "defaults"]]
+  , "ADD_CFLAGS":
     { "type": "let*"
     , "bindings":
-      [ [ "OS"
+      [ [ "COMPILER_FAMILY"
+        , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"}
+        ]
+      , [ "OS"
         , { "type": "var"
           , "name": "OS"
           , "default":
             {"type": "fail", "msg": "Required variable 'OS' is not set."}
           }
         ]
-      , [ "ARCH"
-        , { "type": "var"
-          , "name": "ARCH"
-          , "default":
-            {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-          }
-        ]
       ]
     , "body":
-      { "type": "++"
-      , "$1":
-        [ ["-std=gnu17", "-O2"]
-        , { "type": "case"
-          , "expr": {"type": "var", "name": "OS"}
-          , "case":
-            { "windows":
-              [ "-D_SCL_SECURE_NO_WARNINGS"
-              , "-D_CRT_SECURE_NO_DEPRECATE"
-              , "-D_CRT_NONSTDC_NO_DEPRECATE"
-              , "/GF"
-              , "/MP"
-              , "/nologo"
-              ]
-            }
-          , "default":
-            { "type": "++"
-            , "$1":
-              [ ["-D_GNU_SOURCE", "-Wall", "-Wextra"]
-              , { "type": "case"
-                , "expr": {"type": "var", "name": "OS"}
-                , "case":
-                  { "sunos":
-                    [ "-D_POSIX_C_SOURCE=200112L"
-                    , "-D__EXTENSIONS__"
-                    , "-D_POSIX_PTHREAD_SEMANTICS"
-                    ]
-                  , "solaris":
-                    [ "-D_POSIX_C_SOURCE=200112L"
-                    , "-D__EXTENSIONS__"
-                    , "-D_POSIX_PTHREAD_SEMANTICS"
-                    ]
-                  }
-                }
-              , [ "-Wdocumentation"
-                , "-Wno-documentation-deprecated-sync"
-                , "-Wno-missing-field-initializers"
-                , "-Wstrict-aliasing"
-                , "-Wstrict-prototypes"
-                , "-Wdeclaration-after-statement"
-                , "-Wshift-count-overflow"
-                , "-Wunused-const-variable"
-                , "-Wunused-function"
-                , "-Wint-conversion"
-                , "-Wformat"
-                , "-Wformat-security"
+      { "type": "case"
+      , "expr": {"type": "var", "name": "COMPILER_FAMILY"}
+      , "case":
+        { "msvc":
+          [ "-D_SCL_SECURE_NO_WARNINGS"
+          , "-D_CRT_SECURE_NO_DEPRECATE"
+          , "-D_CRT_NONSTDC_NO_DEPRECATE"
+          , "/GF"
+          , "/MP"
+          , "/nologo"
+          ]
+        }
+      , "default":
+        { "type": "++"
+        , "$1":
+          [ { "type": "case"
+            , "expr": {"type": "var", "name": "OS"}
+            , "case":
+              { "sunos":
+                [ "-D_POSIX_C_SOURCE=200112L"
+                , "-D__EXTENSIONS__"
+                , "-D_POSIX_PTHREAD_SEMANTICS"
+                ]
+              , "solaris":
+                [ "-D_POSIX_C_SOURCE=200112L"
+                , "-D__EXTENSIONS__"
+                , "-D_POSIX_PTHREAD_SEMANTICS"
                 ]
-              ]
+              }
             }
-          }
-        ]
+          , [ "-D_GNU_SOURCE"
+            , "-Wall"
+            , "-Wextra"
+            , "-Wno-documentation-deprecated-sync"
+            , "-Wno-missing-field-initializers"
+            , "-Wstrict-aliasing"
+            , "-Wstrict-prototypes"
+            , "-Wdeclaration-after-statement"
+            , "-Wshift-count-overflow"
+            , "-Wunused-const-variable"
+            , "-Wunused-function"
+            , "-Wint-conversion"
+            , "-Wformat"
+            , "-Wformat-security"
+            ]
+          , { "type": "case"
+            , "expr": {"type": "var", "name": "COMPILER_FAMILY"}
+            , "case": {"clang": ["-Wdocumentation"]}
+            }
+          ]
+        }
       }
     }
-  , "CXXFLAGS": []
-  , "AR": ["ar"]
-  , "PATH": ["/bin", "/sbin", "/usr/bin", "/usr/sbin"]
   }
 }