diff options
| author |  Michael Berlin <mberlin@google.com> | 2015-05-01 16:17:01 -0700 |
|---|---|---|
| committer | Michael Berlin <mberlin@google.com> | 2015-05-01 16:21:23 -0700 |
| commit | bf2e7f0982fa79d9cfb1197d2e062437d1f8a2aa (patch) | |
| tree | 9635303243696560f8cd84f64be9576d4738bded /templates/Makefile.template | |
| parent | 5351392f88094e87c735800267e4fcdf36e51aa2 (diff) | |
Compile protobuf before compiling shared C++ libraries.
This change fixes a parallel make which always failed with "cannot find
-lprotobuf".
For C++ static libraries, protobuf was already added as dependency, see
commit 5383062df6182a62bb4df99aa06fe797fbb09a91.
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index c42bf6387b..6142691f14 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1191,6 +1191,9 @@ endif lib_deps = ' $(ZLIB_DEP)' mingw_libs = '' mingw_lib_deps = ' $(ZLIB_DEP)' + if lib.language == 'c++': + lib_deps += ' $(PROTOBUF_DEP)' + mingw_lib_deps += ' $(PROTOBUF_DEP)' for dep in lib.get('deps', []): libs = libs + ' -l' + dep lib_deps = lib_deps + ' $(LIBDIR)/$(CONFIG)/lib' + dep + '.$(SHARED_EXT)' |