зеркало из https://github.com/mozilla/gecko-dev.git
Bug 702179 Reland 1d0ec7fa8b96 since Bug 719742 is fixed.
This commit is contained in:
Родитель
507cd379ea
Коммит
0fd3f01707
|
@ -238,7 +238,12 @@ ifdef CPP_UNIT_TESTS
|
||||||
CPPSRCS += $(CPP_UNIT_TESTS)
|
CPPSRCS += $(CPP_UNIT_TESTS)
|
||||||
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
|
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
|
||||||
INCLUDES += -I$(DIST)/include/testing
|
INCLUDES += -I$(DIST)/include/testing
|
||||||
LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS) $(MOZ_JS_LIBS)
|
LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
|
||||||
|
ifdef JS_SHARED_LIBRARY
|
||||||
|
ifdef MOZ_SHARK
|
||||||
|
LIBS += $(MOZ_JS_LIBS)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
# ...and run them the usual way
|
# ...and run them the usual way
|
||||||
check::
|
check::
|
||||||
|
|
|
@ -1301,7 +1301,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
|
||||||
MOZ_PNG_CFLAGS=
|
MOZ_PNG_CFLAGS=
|
||||||
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
|
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
|
||||||
|
|
||||||
MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
|
MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)'
|
||||||
MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
|
MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
|
||||||
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
|
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
|
||||||
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
|
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
|
||||||
|
|
|
@ -93,7 +93,6 @@ ifdef JS_SHARED_LIBRARY
|
||||||
FORCE_SHARED_LIB = 1
|
FORCE_SHARED_LIB = 1
|
||||||
endif
|
endif
|
||||||
FORCE_STATIC_LIB = 1
|
FORCE_STATIC_LIB = 1
|
||||||
DIST_INSTALL = 1
|
|
||||||
|
|
||||||
VPATH = \
|
VPATH = \
|
||||||
$(srcdir) \
|
$(srcdir) \
|
||||||
|
|
|
@ -238,7 +238,12 @@ ifdef CPP_UNIT_TESTS
|
||||||
CPPSRCS += $(CPP_UNIT_TESTS)
|
CPPSRCS += $(CPP_UNIT_TESTS)
|
||||||
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
|
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
|
||||||
INCLUDES += -I$(DIST)/include/testing
|
INCLUDES += -I$(DIST)/include/testing
|
||||||
LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS) $(MOZ_JS_LIBS)
|
LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
|
||||||
|
ifdef JS_SHARED_LIBRARY
|
||||||
|
ifdef MOZ_SHARK
|
||||||
|
LIBS += $(MOZ_JS_LIBS)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
# ...and run them the usual way
|
# ...and run them the usual way
|
||||||
check::
|
check::
|
||||||
|
|
Загрузка…
Ссылка в новой задаче