mirrors/gecko-dev
1
0
Fork 1
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-11-10 05:08:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1036525 - DSO_SONAME should not depend on FORCE_SHARED_LIB, r=glandium

Browse source
This commit is contained in:
Steve Fink 2014-07-09 17:16:19 -07:00
parent 00d8fa7118
commit 12341263ec
1 changed files with 8 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
config/rules.mk
View file

@ -177,18 +177,20 @@ else
SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX) SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX)
endif endif
ifdef SONAME
DSO_SONAME = $(DLL_PREFIX)$(SONAME)$(DLL_SUFFIX)
else
DSO_SONAME = $(notdir $@)
endif
EMBED_MANIFEST_AT=2 EMBED_MANIFEST_AT=2
endif # MKSHLIB endif # MKSHLIB
endif # FORCE_SHARED_LIB endif # FORCE_SHARED_LIB
endif # LIBRARY endif # LIBRARY
ifdef MKSHLIB
ifdef SONAME
DSO_SONAME = $(DLL_PREFIX)$(SONAME)$(DLL_SUFFIX)
else
DSO_SONAME = $(notdir $@)
endif
endif # MKSHLIB
ifdef FORCE_STATIC_LIB ifdef FORCE_STATIC_LIB
ifndef FORCE_SHARED_LIB ifndef FORCE_SHARED_LIB
SHARED_LIBRARY := $(NULL) SHARED_LIBRARY := $(NULL)