зеркало из https://github.com/mozilla/pjs.git
trying to fix debug build bustage on linux.
This commit is contained in:
Родитель
f0e68de991
Коммит
ee0a7a5c69
|
@ -86,7 +86,13 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/config.mk
|
include $(topsrcdir)/config/config.mk
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifndef BUILD_STATIC_LIBS
|
||||||
|
|
||||||
|
ifdef NS_TRACE_MALLOC
|
||||||
|
EXTRA_DSO_LIBS += tracemalloc
|
||||||
|
endif
|
||||||
|
|
||||||
|
else
|
||||||
include $(topsrcdir)/config/static-config.mk
|
include $(topsrcdir)/config/static-config.mk
|
||||||
|
|
||||||
EXTRA_DEPS += \
|
EXTRA_DEPS += \
|
||||||
|
|
|
@ -110,6 +110,16 @@ CPPSRCS = \
|
||||||
nsXREDirProvider.cpp \
|
nsXREDirProvider.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||||
|
STACKWALK_SRC_LCSRCS = \
|
||||||
|
nsStackFrameUnix.cpp \
|
||||||
|
nsStackFrameUnix.h \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
STACKWALK_CPPSRCS := $(addprefix $(topsrcdir)/xpcom/base/, $(STACKWALK_SRC_LCSRCS))
|
||||||
|
CPPSRCS += nsSigHandlers.cpp nsStackFrameUnix.cpp
|
||||||
|
endif
|
||||||
|
|
||||||
GARBAGE += $(SHAREDSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
GARBAGE += $(SHAREDSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
GARBAGE += $(addprefix $(srcdir)/,$(SHAREDSRCS))
|
GARBAGE += $(addprefix $(srcdir)/,$(SHAREDSRCS))
|
||||||
|
@ -117,7 +127,7 @@ endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/xpfe/bootstrap
|
LOCAL_INCLUDES += -I$(topsrcdir)/xpfe/bootstrap -I.
|
||||||
CXXFLAGS += $(TK_CFLAGS)
|
CXXFLAGS += $(TK_CFLAGS)
|
||||||
|
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifdef BUILD_STATIC_LIBS
|
||||||
|
|
Загрузка…
Ссылка в новой задаче