1 files changed, 4 insertions, 35 deletions
diff --git a/CC/RULES b/CC/RULES
index d687bf3..01aa634 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -387,10 +387,8 @@
     , "compile-deps": "compile-deps"
     , "link-deps": "link-deps"
     , "objects": "objects"
-    , "default-CC": "default-CC"
-    , "default-CXX": "default-CXX"
-    , "default-CFLAGS": "default-CFLAGS"
-    , "default-CXXFLAGS": "default-CXXFLAGS"
+    , "compiler": "compiler"
+    , "flags": "flags"
     , "default-ENV": "default-ENV"
     }
   , "expression":
@@ -430,37 +428,8 @@
             }
           }
         ]
-      , [ "CXX"
-        , { "type": "if"
-          , "cond": {"type": "FIELD", "name": "pure C"}
-          , "then":
-            { "type": "var"
-            , "name": "CC"
-            , "default": {"type": "CALL_EXPRESSION", "name": "default-CC"}
-            }
-          , "else":
-            { "type": "var"
-            , "name": "CXX"
-            , "default": {"type": "CALL_EXPRESSION", "name": "default-CXX"}
-            }
-          }
-        ]
-      , [ "CXXFLAGS"
-        , { "type": "if"
-          , "cond": {"type": "FIELD", "name": "pure C"}
-          , "then":
-            { "type": "var"
-            , "name": "CFLAGS"
-            , "default": {"type": "CALL_EXPRESSION", "name": "default-CFLAGS"}
-            }
-          , "else":
-            { "type": "var"
-            , "name": "CXXFLAGS"
-            , "default":
-              {"type": "CALL_EXPRESSION", "name": "default-CXXFLAGS"}
-            }
-          }
-        ]
+      , ["CXX", {"type": "CALL_EXPRESSION", "name": "compiler"}]
+      , ["CXXFLAGS", {"type": "CALL_EXPRESSION", "name": "flags"}]
       , [ "CXXFLAGS"
         , { "type": "++"
           , "$1":