diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-08-25 12:17:26 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-09-13 10:51:13 +0200 |
| commit | 7ccfae885273899d42c0ea6059fc6910e72aedbb (patch) | |
| tree | 87f260be06588403e0e72890623c0b8c706aea61 /CC/EXPRESSIONS | |
| parent | 3e4e38f6987d7435232b175fd0070608b76b4d50 (diff) | |
| download | rules-cc-7ccfae885273899d42c0ea6059fc6910e72aedbb.tar.gz | |
Rules: Implement setting ADD_{C,CXX}FLAGS via variables
Diffstat (limited to 'CC/EXPRESSIONS')
| -rw-r--r-- | CC/EXPRESSIONS | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS index 7ebc8ad..a1033d9 100644 --- a/CC/EXPRESSIONS +++ b/CC/EXPRESSIONS @@ -358,7 +358,7 @@ } } , "flags": - { "vars": ["CFLAGS", "CXXFLAGS"] + { "vars": ["CFLAGS", "CXXFLAGS", "ADD_CFLAGS", "ADD_CXXFLAGS"] , "imports": { "default-CFLAGS": "default-CFLAGS" , "default-CXXFLAGS": "default-CXXFLAGS" @@ -367,14 +367,24 @@ { "type": "if" , "cond": {"type": "FIELD", "name": "pure C"} , "then": - { "type": "var" - , "name": "CFLAGS" - , "default": {"type": "CALL_EXPRESSION", "name": "default-CFLAGS"} + { "type": "++" + , "$1": + [ { "type": "var" + , "name": "CFLAGS" + , "default": {"type": "CALL_EXPRESSION", "name": "default-CFLAGS"} + } + , {"type": "var", "name": "ADD_CFLAGS", "default": []} + ] } , "else": - { "type": "var" - , "name": "CXXFLAGS" - , "default": {"type": "CALL_EXPRESSION", "name": "default-CXXFLAGS"} + { "type": "++" + , "$1": + [ { "type": "var" + , "name": "CXXFLAGS" + , "default": {"type": "CALL_EXPRESSION", "name": "default-CXXFLAGS"} + } + , {"type": "var", "name": "ADD_CXXFLAGS", "default": []} + ] } } } @@ -382,8 +392,10 @@ { "vars": [ "CXX" , "CXXFLAGS" + , "ADD_CXXFLAGS" , "CC" , "CFLAGS" + , "ADD_CFLAGS" , "ENV" , "AR" , "srcs" @@ -501,8 +513,10 @@ { "vars": [ "CXX" , "CXXFLAGS" + , "ADD_CXXFLAGS" , "CC" , "CFLAGS" + , "ADD_CFLAGS" , "ENV" , "AR" , "srcs" |