diff options
Diffstat (limited to 'rules/CC/auto')
| -rw-r--r-- | rules/CC/auto/RULES | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/rules/CC/auto/RULES b/rules/CC/auto/RULES index e04289c..247ee01 100644 --- a/rules/CC/auto/RULES +++ b/rules/CC/auto/RULES @@ -156,6 +156,8 @@ , "flags-cc": ["./", "..", "flags-cc"] , "flags-cxx": ["./", "..", "flags-cxx"] , "default-ENV": ["./", "..", "default-ENV"] + , "default-TOOLCHAIN": ["./", "..", "default-TOOLCHAIN"] + , "default-NON_SYSTEM_TOOLS": ["./", "..", "default-NON_SYSTEM_TOOLS"] } , "implicit": {"defaults": [["./", "..", "defaults"]]} , "expression": @@ -197,6 +199,17 @@ } } ] + , ["TOOLCHAIN_DIR", "toolchain"] + , ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}] + , [ "TOOLCHAIN" + , { "type": "to_subdir" + , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"} + , "$1": {"type": "var", "name": "TOOLCHAIN"} + } + ] + , [ "NON_SYSTEM_TOOLS" + , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"} + ] , ["CC", {"type": "CALL_EXPRESSION", "name": "compiler-cc"}] , ["CXX", {"type": "CALL_EXPRESSION", "name": "compiler-cxx"}] , ["CFLAGS", {"type": "CALL_EXPRESSION", "name": "flags-cc"}] @@ -204,16 +217,9 @@ , [ "ENV" , { "type": "map_union" , "$1": - { "type": "++" - , "$1": - [ {"type": "CALL_EXPRESSION", "name": "default-ENV"} - , [ { "type": "var" - , "name": "ENV" - , "default": {"type": "empty_map"} - } - ] - ] - } + [ {"type": "CALL_EXPRESSION", "name": "default-ENV"} + , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}} + ] } ] , [ "c.flags" @@ -529,7 +535,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["file_check.sh", "c.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["file_check.sh", "c.flags"]} , {"type": "var", "name": "includes"} ] } @@ -572,7 +579,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["file_check.sh", "cxx.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["file_check.sh", "cxx.flags"]} , {"type": "var", "name": "includes"} ] } @@ -615,7 +623,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["type_check.sh", "c.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["type_check.sh", "c.flags"]} , {"type": "var", "name": "includes"} ] } @@ -658,7 +667,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["type_check.sh", "cxx.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["type_check.sh", "cxx.flags"]} , {"type": "var", "name": "includes"} ] } @@ -703,7 +713,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["symbol_check.sh", "c.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["symbol_check.sh", "c.flags"]} , {"type": "var", "name": "includes"} ] } @@ -753,7 +764,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["symbol_check.sh", "cxx.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["symbol_check.sh", "cxx.flags"]} , {"type": "var", "name": "includes"} ] } @@ -803,7 +815,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["size_check.sh", "c.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["size_check.sh", "c.flags"]} , {"type": "var", "name": "includes"} ] } @@ -860,7 +873,8 @@ , "inputs": { "type": "map_union" , "$1": - [ {"type": "env", "vars": ["size_check.sh", "cxx.flags"]} + [ {"type": "var", "name": "TOOLCHAIN"} + , {"type": "env", "vars": ["size_check.sh", "cxx.flags"]} , {"type": "var", "name": "includes"} ] } |