diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-02-13 23:00:54 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-02-13 23:37:17 +0100 |
| commit | e00d63f3ea3a141227ac405be35ef6ef210f49c9 (patch) | |
| tree | d46319e0a5a16ac9da983b6c87ae0baa2384e372 /templates/Makefile.template | |
| parent | f43c2e533ec53f277b8047067a8d5c4265097328 (diff) | |
| parent | dfa88e95c5584ccce7c339e704ac5c1ad3bfb894 (diff) | |
Merge remote-tracking branch 'google/v1.1.x'
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 10d7861f03..f81d643991 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1492,7 +1492,7 @@ out_mingbase = '$(LIBDIR)/$(CONFIG)/' + lib.name + '$(SHARED_VERSION_' + lang_to_var[lib.language] + ')' out_libbase = '$(LIBDIR)/$(CONFIG)/lib' + lib.name + '$(SHARED_VERSION_' + lang_to_var[lib.language] + ')' - common = '$(LIB' + lib.name.upper() + '_OBJS) $(LDLIBS)' + common = '$(LIB' + lib.name.upper() + '_OBJS)' link_libs = '' lib_deps = ' $(ZLIB_DEP)' @@ -1542,6 +1542,8 @@ ldflags = '$(LDFLAGS)' if lib.get('LDFLAGS', None): ldflags += ' ' + lib['LDFLAGS'] + + common = common + ' $(LDLIBS)' %> % if lib.build == "all": |