diff options
author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-06-24 14:21:11 +0200 |
---|---|---|
committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-06-24 14:21:11 +0200 |
commit | 708ada9a0932b628091abe7b5178259fcde5c11b (patch) | |
tree | 47c4c24b57d0aeee7364e8c198aa7e701bce3275 | |
parent | b4d1cbc8d77bdffaeab6b01edf5f54eeeb1b81d3 (diff) | |
parent | cdd0b740cdaf6fd54d479766f8be45352f238bd4 (diff) | |
download | rules-cc-708ada9a0932b628091abe7b5178259fcde5c11b.tar.gz |
Merge commit 'cdd0b740cdaf6fd54d479766f8be45352f238bd4' into HEAD
-rw-r--r-- | CC/proto/EXPRESSIONS | 1 | ||||
-rw-r--r-- | CC/proto/RULES | 8 | ||||
-rw-r--r-- | CC/test/RULES | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/CC/proto/EXPRESSIONS b/CC/proto/EXPRESSIONS index 2286d06..0b44506 100644 --- a/CC/proto/EXPRESSIONS +++ b/CC/proto/EXPRESSIONS @@ -128,6 +128,7 @@ , "ADD_CXXFLAGS" , "AR" , "ENV" + , "DEBUG" , "name" , "stage" , "service support" diff --git a/CC/proto/RULES b/CC/proto/RULES index a191f16..f42c783 100644 --- a/CC/proto/RULES +++ b/CC/proto/RULES @@ -274,14 +274,14 @@ } , "library": { "doc": - [ "A library C++ library, generated from proto files." + [ "A C++ library, generated from proto files." , "" , "This rule usually is used to bind anonymous targets generated from" , "proto libraries." ] , "string_fields": ["name", "stage"] , "target_fields": ["srcs", "deps"] - , "config_vars": ["CXX", "CXXFLAGS", "ADD_CXXFLAGS", "AR", "ENV"] + , "config_vars": ["CXX", "CXXFLAGS", "ADD_CXXFLAGS", "AR", "ENV", "DEBUG"] , "implicit": {"defaults": [["./", "..", "defaults"]], "proto-defaults": ["defaults"]} , "imports": {"protoc-compile": "protoc-compile"} @@ -303,14 +303,14 @@ } , "service library": { "doc": - [ "A service library C++ library, generated from proto files." + [ "A service C++ library, generated from proto files." , "" , "Calls protoc with gRPC plugin to additionally generate gRPC services" , "from proto libraries." ] , "string_fields": ["name", "stage"] , "target_fields": ["srcs", "deps"] - , "config_vars": ["CXX", "CXXFLAGS", "ADD_CXXFLAGS", "AR", "ENV"] + , "config_vars": ["CXX", "CXXFLAGS", "ADD_CXXFLAGS", "AR", "ENV", "DEBUG"] , "implicit": { "defaults": [["./", "..", "defaults"]] , "proto-defaults": ["service defaults"] diff --git a/CC/test/RULES b/CC/test/RULES index c0e8729..b8c400c 100644 --- a/CC/test/RULES +++ b/CC/test/RULES @@ -53,7 +53,7 @@ , "" , "This running of the test is carried out by the implicit dependency" , "on the target \"runner\". By setting this target in the target layer" - , "of this rues repository (instead of letting it default to the" + , "of this rules repository (instead of letting it default to the" , "respective file), the C/C++ test environment can be modified globally." ] , "private-hdrs": |