2 files changed, 11 insertions, 46 deletions
diff --git a/etc/defaults/CC/TARGETS b/etc/defaults/CC/TARGETS
index 97ca6ae8..9249590a 100644
--- a/etc/defaults/CC/TARGETS
+++ b/etc/defaults/CC/TARGETS
@@ -2,34 +2,7 @@
   { "type": ["CC", "defaults"]
   , "arguments_config": ["TOOLCHAIN_CONFIG", "DEBUG"]
   , "base": [["@", "toolchain", "CC", "defaults"]]
-  , "ADD_CFLAGS":
-    { "type": "case"
-    , "expr":
-      { "type": "lookup"
-      , "map":
-        { "type": "var"
-        , "name": "TOOLCHAIN_CONFIG"
-        , "default": {"type": "empty_map"}
-        }
-      , "key": "FAMILY"
-      , "default": "unknown"
-      }
-    , "case":
-      { "msvc":
-        { "type": "if"
-        , "cond": {"type": "var", "name": "DEBUG"}
-        , "then": ["/Od", "/Z7"]
-        , "else": ["/O2", "/DNDEBUG"]
-        }
-      }
-    , "default":
-      { "type": "if"
-      , "cond": {"type": "var", "name": "DEBUG"}
-      , "then": ["-O0", "-g"]
-      , "else": ["-O2", "-DNDEBUG"]
-      }
-    }
-  , "ADD_CXXFLAGS":
+  , "ADD_COMPILE_FLAGS":
     { "type": "case"
     , "expr":
       { "type": "lookup"
diff --git a/etc/defaults/CC/TARGETS.just b/etc/defaults/CC/TARGETS.just
index f1cb87bc..9002d5b4 100644
--- a/etc/defaults/CC/TARGETS.just
+++ b/etc/defaults/CC/TARGETS.just
@@ -1,23 +1,15 @@
 { "defaults":
   { "type": ["CC", "defaults"]
   , "base": [["@", "base", "CC", "defaults"]]
-  , "ADD_CFLAGS":
-    [ "-std=gnu17"
-    , "-Wall"
-    , "-Wextra"
-    , "-Wpedantic"
-    , "-Wsign-conversion"
-    , "-Werror"
-    , "-pedantic-errors"
-    ]
-  , "ADD_CXXFLAGS":
-    [ "-std=c++20"
-    , "-Wall"
-    , "-Wextra"
-    , "-Wpedantic"
-    , "-Wsign-conversion"
-    , "-Werror"
-    , "-pedantic-errors"
-    ]
+  , "ADD_CFLAGS": ["-std=gnu17"]
+  , "ADD_CXXFLAGS": ["-std=c++20"]
   }
+, "ADD_COMPILE_FLAGS":
+  [ "-Wall"
+  , "-Wextra"
+  , "-Wpedantic"
+  , "-Wsign-conversion"
+  , "-Werror"
+  , "-pedantic-errors"
+  ]
 }