diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-01-13 17:03:32 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-01-13 17:03:32 -0800 |
| commit | 8afc6c711f5506d5a8e11fc6e59f62a3ba0648dd (patch) | |
| tree | bfba8437ceeba4dc07a0a47a87851e00db9c2af8 /templates/Makefile.template | |
| parent | 7752779c3bd3396e7e976c0cad4a6c24fc42623e (diff) | |
| parent | 9e47552e53e7c7531e63560af3b017ad82ff4cef (diff) | |
Merge pull request #21 from nicolasnoble/c_and_cxx_mixup
Don't mix C and C++ libraries.
Diffstat (limited to 'templates/Makefile.template')
| -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 d0ebb10240..798e7e3377 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -329,7 +329,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 @@ -337,7 +337,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 |