summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-04-29 17:08:41 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-04-29 17:08:41 +0200
commitfac297f617d7656bfbd2b60fa736c31d1d1a3d9b (patch)
treef113dc1ac4b69069c10c10e5d458741780e9999a
parentcb9bad3e417b379bde6761a82ba472296232fc7a (diff)
parenta39470f45d63faff07dd60972901709755049db0 (diff)
downloadrules-cc-fac297f617d7656bfbd2b60fa736c31d1d1a3d9b.tar.gz
Merge branch 'just-rules' into rules
-rw-r--r--CC/RULES11
1 files changed, 9 insertions, 2 deletions
diff --git a/CC/RULES b/CC/RULES
index 230c397..55e639a 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -13,6 +13,7 @@
, "CFLAGS"
, "CXXFLAGS"
, "LDFLAGS"
+ , "ADD_COMPILE_FLAGS"
, "ADD_CFLAGS"
, "ADD_CXXFLAGS"
, "ADD_LDFLAGS"
@@ -55,12 +56,16 @@
[ "Linker flags for linking the final CC library. Specifying this field"
, "overwrites values from \"base\"."
]
+ , "ADD_COMPILE_FLAGS":
+ [ "Additional compilation flags for C and C++. Specifying this field"
+ , "extends values from \"base\" for both, \"CFLAGS\" and \"CXXFLAGS\"."
+ ]
, "ADD_CFLAGS":
- [ "Additional compilation flags for C. Specifying this field"
+ [ "Additional compilation flags specific for C. Specifying this field"
, "extends values from \"base\"."
]
, "ADD_CXXFLAGS":
- [ "Additional compilation flags for C++. Specifying this field"
+ [ "Additional compilation flags specific for C++. Specifying this field"
, "extends values from \"base\"."
]
, "ADD_LDFLAGS":
@@ -261,6 +266,7 @@
, { "type": "++"
, "$1":
[ {"type": "var", "name": "CFLAGS"}
+ , {"type": "FIELD", "name": "ADD_COMPILE_FLAGS"}
, {"type": "FIELD", "name": "ADD_CFLAGS"}
]
}
@@ -269,6 +275,7 @@
, { "type": "++"
, "$1":
[ {"type": "var", "name": "CXXFLAGS"}
+ , {"type": "FIELD", "name": "ADD_COMPILE_FLAGS"}
, {"type": "FIELD", "name": "ADD_CXXFLAGS"}
]
}