mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Bug 78081 - Don't export intermediate libraries, initial changes blanket-r=mento
This commit is contained in:
parent
c7d6f89c6a
commit
55870ae999
@ -144,7 +144,7 @@ CMSRCS = MacLaunchHelper.m
|
||||
CPPSRCS += nsCommandLineServiceMac.cpp
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/xpfe/bootstrap/appleevents
|
||||
OS_CXXFLAGS += -fexceptions
|
||||
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)appleevents_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += $(DEPTH)/xpfe/bootstrap/appleevents/$(LIB_PREFIX)appleevents_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||
|
@ -141,9 +141,7 @@ SDK_HEADERS = \
|
||||
|
||||
# pull in MoreFiles for MacOSX
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
EXTRA_DSO_LIBS = macmorefiles_s
|
||||
EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS)
|
||||
EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += ../MoreFiles/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
# Force use of PIC
|
||||
|
@ -78,7 +78,7 @@ DEFINES += -DSTANDALONE_REGISTRY
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
LIBS += -lmacmorefiles_s
|
||||
LIBS += $(DEPTH)/xpcom/MoreFiles/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
|
||||
LDFLAGS += $(TK_LIBS)
|
||||
endif
|
||||
|
||||
|
@ -144,7 +144,7 @@ CPPSRCS += \
|
||||
nsAppleSingleDecoder.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/dist/lib/libmacmorefiles_s.a
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/xpcom/MoreFiles/libmacmorefiles_s.a
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../public
|
||||
|
Loading…
Reference in New Issue
Block a user