diff options
author | Craig Tiller <ctiller@google.com> | 2015-01-13 17:04:18 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-01-13 17:04:18 -0800 |
commit | ee988bc497bc78937211e444d1ea1fd821e177b2 (patch) | |
tree | aaf0c0cbe12f032edcdf5f71454a8a42b5e9acf4 /templates | |
parent | 699ba2135a4bea55c431f23ab6e3ebd3981b63ca (diff) | |
parent | 8afc6c711f5506d5a8e11fc6e59f62a3ba0648dd (diff) |
Merge github.com:google/grpc into gcov
Diffstat (limited to 'templates')
-rw-r--r-- | templates/Makefile.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index b835c337e8..256380c2dd 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -338,7 +338,7 @@ privatelibs: privatelibs_c privatelibs_cxx privatelibs_c: dep_c\ % for lib in libs: -% if lib.build == 'private': +% if lib.build == 'private' and not lib.get('c++', False): libs/$(CONFIG)/lib${lib.name}.a\ % endif % endfor @@ -346,7 +346,7 @@ privatelibs_c: dep_c\ privatelibs_cxx: dep_cxx\ % for lib in libs: -% if lib.build == 'private': +% if lib.build == 'private' and lib.get('c++', False): libs/$(CONFIG)/lib${lib.name}.a\ % endif % endfor |