diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-04-13 09:56:17 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-04-13 09:56:17 -0700 |
| commit | a41fd5b0861f01a7be447eb3abfd903a6f623fa8 (patch) | |
| tree | a2b268872d24c80fc894d0441a2e5af084c47209 /templates/Makefile.template | |
| parent | 4d0ee2a56b71b3eae4865c6440362daebba0b5f7 (diff) | |
| parent | e48dd23092a58c76a1cb486846fbeea38f60af3e (diff) | |
Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 8f61a8b990..1e6ca9337d 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1609,7 +1609,7 @@ ifeq ($(SYSTEM),Darwin) $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) -dynamiclib -o ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${common}${link_libs} else - $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,lib${lib.name}.so.${settings.core_version.major} -o ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${common}${link_libs} + $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,lib${lib.name}.so.${settings.get(lang_to_var[lib.language].lower() + '_version').major} -o ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${common}${link_libs} $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) ${out_libbase}.so.${settings.get(lang_to_var[lib.language].lower() + '_version').major} $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) ${out_libbase}.so endif |