mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-14 02:31:59 +00:00
Merge mozilla-central to build-system.
This commit is contained in:
Mitchell Field
commit
e1050276ef
24
Makefile.in
24
Makefile.in
@ -94,12 +94,12 @@ check::
|
||||
endif
|
||||
|
||||
default alldep all:: $(topsrcdir)/configure config.status
|
||||
$(RM) -rf $(DIST)/sdk
|
||||
$(RM) -rf $(DIST)/include
|
||||
$(RM) -rf $(DIST)/private
|
||||
$(RM) -rf $(DIST)/public
|
||||
$(RM) -rf $(DIST)/bin/components
|
||||
$(RM) -rf _tests
|
||||
$(RM) -r $(DIST)/sdk
|
||||
$(RM) -r $(DIST)/include
|
||||
$(RM) -r $(DIST)/private
|
||||
$(RM) -r $(DIST)/public
|
||||
$(RM) -r $(DIST)/bin/components
|
||||
$(RM) -r _tests
|
||||
|
||||
$(topsrcdir)/configure: $(topsrcdir)/configure.in
|
||||
@echo "STOP! configure.in has changed, and your configure is out of date."
|
||||
@ -117,7 +117,7 @@ config.status: $(topsrcdir)/configure
|
||||
|
||||
# Build pseudo-external modules first when export is explicitly called
|
||||
export::
|
||||
$(RM) -rf $(DIST)/sdk
|
||||
$(RM) -r $(DIST)/sdk
|
||||
$(MAKE) -C config export
|
||||
$(MAKE) tier_nspr
|
||||
|
||||
@ -130,7 +130,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
distclean::
|
||||
cat unallmakefiles | $(XARGS) rm -f
|
||||
rm -f unallmakefiles $(DIST_GARBAGE)
|
||||
$(RM) unallmakefiles $(DIST_GARBAGE)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
# we want to copy PDB files on Windows
|
||||
@ -176,8 +176,8 @@ ifdef USE_ELF_HACK
|
||||
$(MAKE) -C $(MOZ_BUILD_APP)/installer elfhack
|
||||
endif
|
||||
echo building symbol store
|
||||
$(RM) -rf $(DIST)/crashreporter-symbols
|
||||
$(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
|
||||
$(RM) -r $(DIST)/crashreporter-symbols
|
||||
$(RM) "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
|
||||
$(NSINSTALL) -D $(DIST)/crashreporter-symbols
|
||||
$(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/symbolstore.py \
|
||||
$(MAKE_SYM_STORE_ARGS) \
|
||||
@ -199,8 +199,8 @@ else
|
||||
ifdef WINCE
|
||||
ifdef SYMBOLSTORE_PATH
|
||||
echo building symbol store with symstore.exe
|
||||
$(RM) -rf $(DIST)/symbols
|
||||
$(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
|
||||
$(RM) -r $(DIST)/symbols
|
||||
$(RM) "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
|
||||
$(NSINSTALL) -D $(DIST)/symbols
|
||||
$(SYMBOLSTORE_PATH) add -r -f "$(subst /,\,$(shell pwd -W))\*.PDB" \
|
||||
-s $(DIST)/symbols/ -t "$(MOZ_PKG_APPNAME)" -v "$(MOZ_PKG_VERSION)"
|
||||
|
||||
1
aclocal.m4
vendored
1
aclocal.m4
vendored
@ -14,6 +14,7 @@ builtin(include, build/autoconf/altoptions.m4)dnl
|
||||
builtin(include, build/autoconf/mozprog.m4)dnl
|
||||
builtin(include, build/autoconf/mozheader.m4)dnl
|
||||
builtin(include, build/autoconf/acwinpaths.m4)dnl
|
||||
builtin(include, build/autoconf/lto.m4)dnl
|
||||
|
||||
MOZ_PROG_CHECKMSYS()
|
||||
|
||||
|
||||
@ -318,7 +318,7 @@ AB_CD = $(MOZ_UI_LOCALE)
|
||||
AB := $(firstword $(subst -, ,$(AB_CD)))
|
||||
|
||||
clean clobber repackage::
|
||||
rm -rf $(DIST)/$(APP_NAME).app
|
||||
$(RM) -r $(DIST)/$(APP_NAME).app
|
||||
|
||||
ifdef LIBXUL_SDK
|
||||
APPFILES = Resources
|
||||
@ -327,9 +327,9 @@ APPFILES = MacOS
|
||||
endif
|
||||
|
||||
libs repackage:: $(PROGRAM) application.ini
|
||||
mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
$(MKDIR) -p $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
|
||||
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
|
||||
$(MKDIR) -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
|
||||
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
|
||||
sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%LOWER_APP_NAME%/$(LOWER_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
|
||||
sed -e "s/%APP_NAME%/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
|
||||
@ -338,7 +338,7 @@ libs repackage:: $(PROGRAM) application.ini
|
||||
ifdef LIBXUL_SDK
|
||||
cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox-bin
|
||||
else
|
||||
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
|
||||
$(RM) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
|
||||
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
endif
|
||||
-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
|
||||
|
||||
@ -94,7 +94,8 @@ installer::
|
||||
# For building the uninstaller during the application build so it can be
|
||||
# included for mar file generation.
|
||||
uninstaller::
|
||||
$(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
|
||||
$(RM) -r $(CONFIG_DIR)
|
||||
$(MKDIR) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
|
||||
$(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
|
||||
@ -104,7 +105,8 @@ uninstaller::
|
||||
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
|
||||
|
||||
$(CONFIG_DIR)/setup.exe::
|
||||
$(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
|
||||
$(RM) -r $(CONFIG_DIR)
|
||||
$(MKDIR) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
|
||||
$(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
|
||||
|
||||
15
build/autoconf/lto.m4
Normal file
15
build/autoconf/lto.m4
Normal file
@ -0,0 +1,15 @@
|
||||
dnl check if the build is using lto. This is really primitive and only detects llvm based
|
||||
dnl compilers right now.
|
||||
AC_DEFUN(MOZ_DOING_LTO,
|
||||
[
|
||||
cat > conftest.c <<EOF
|
||||
int foo = 1;
|
||||
EOF
|
||||
$1=no
|
||||
if ${CC-cc} ${CFLAGS} -S conftest.c -o conftest.s >/dev/null 2>&1; then
|
||||
if grep '^target triple =' conftest.s; then
|
||||
$1=yes
|
||||
fi
|
||||
fi
|
||||
rm -f conftest.[cs]
|
||||
])
|
||||
@ -104,8 +104,7 @@ HEADERS = \
|
||||
|
||||
export:: $(TARGETS) $(HEADERS)
|
||||
$(INSTALL) $(IFLAGS1) $(HEADERS) $(DIST)/include
|
||||
-rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
|
||||
-rm -f $(DIST)/bin/chrome/chromelist.txt
|
||||
-$(RM) $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
|
||||
ifdef HOST_PROGRAM
|
||||
$(INSTALL) $(HOST_PROGRAM) $(DIST)/bin
|
||||
endif
|
||||
|
||||
@ -159,6 +159,9 @@ endif
|
||||
|
||||
CC := $(CC_WRAPPER) $(CC)
|
||||
CXX := $(CXX_WRAPPER) $(CXX)
|
||||
MKDIR ?= mkdir
|
||||
SLEEP ?= sleep
|
||||
TOUCH ?= touch
|
||||
|
||||
# determine debug-related options
|
||||
_DEBUG_CFLAGS :=
|
||||
|
||||
@ -934,24 +934,24 @@ checkout:
|
||||
$(MAKE) -C $(topsrcdir) -f client.mk checkout
|
||||
|
||||
clean clobber realclean clobber_all:: $(SUBMAKEFILES)
|
||||
-rm -f $(ALL_TRASH)
|
||||
-rm -rf $(ALL_TRASH_DIRS)
|
||||
-$(RM) $(ALL_TRASH)
|
||||
-$(RM) -r $(ALL_TRASH_DIRS)
|
||||
$(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir)))
|
||||
|
||||
distclean:: $(SUBMAKEFILES)
|
||||
$(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir)))
|
||||
-rm -rf $(ALL_TRASH_DIRS)
|
||||
-rm -f $(ALL_TRASH) \
|
||||
-$(RM) -r $(ALL_TRASH_DIRS)
|
||||
-$(RM) $(ALL_TRASH) \
|
||||
Makefile .HSancillary \
|
||||
$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \
|
||||
$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
|
||||
$(wildcard *.$(IMPORT_LIB_SUFFIX))
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
-rm -f $(PROGRAM:.exe=.map)
|
||||
-$(RM) $(PROGRAM:.exe=.map)
|
||||
endif
|
||||
|
||||
alltags:
|
||||
rm -f TAGS
|
||||
$(RM) TAGS
|
||||
find $(topsrcdir) -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' -o -name '*.idl' \) -print | $(TAG_PROGRAM)
|
||||
|
||||
#
|
||||
@ -959,7 +959,7 @@ alltags:
|
||||
# creates OBJS, links with LIBS to create Foo
|
||||
#
|
||||
$(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
|
||||
@rm -f $@.manifest
|
||||
@$(RM) $@.manifest
|
||||
ifeq (WINCE,$(OS_ARCH))
|
||||
$(EXPAND_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
else
|
||||
@ -1110,7 +1110,7 @@ EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
||||
endif
|
||||
|
||||
$(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
||||
rm -f $(LIBRARY)
|
||||
$(RM) $(LIBRARY)
|
||||
$(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS)
|
||||
$(RANLIB) $@
|
||||
|
||||
@ -1123,7 +1123,7 @@ endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
$(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
echo LIBRARY $(SHARED_LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $@
|
||||
echo PROTMODE >> $@
|
||||
echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@
|
||||
@ -1133,13 +1133,13 @@ $(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
|
||||
$(ADD_TO_DEF_FILE)
|
||||
|
||||
$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
$(IMPLIB) $@ $^
|
||||
$(RANLIB) $@
|
||||
endif # OS/2
|
||||
|
||||
$(HOST_LIBRARY): $(HOST_OBJS) Makefile
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
$(HOST_AR) $(HOST_AR_FLAGS) $(HOST_OBJS)
|
||||
$(HOST_RANLIB) $@
|
||||
|
||||
@ -1161,14 +1161,14 @@ endif
|
||||
|
||||
$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
|
||||
ifndef INCREMENTAL_LINKER
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
endif
|
||||
ifdef DTRACE_LIB_DEPENDENT
|
||||
ifndef XP_MACOSX
|
||||
dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
|
||||
endif
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
||||
@rm -f $(DTRACE_PROBE_OBJ)
|
||||
@$(RM) $(DTRACE_PROBE_OBJ)
|
||||
else # ! DTRACE_LIB_DEPENDENT
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
||||
endif # DTRACE_LIB_DEPENDENT
|
||||
@ -1186,7 +1186,7 @@ ifdef MOZ_PROFILE_GENERATE
|
||||
touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
|
||||
endif
|
||||
endif # WINNT && !GCC
|
||||
@rm -f foodummyfilefoo $(DELETE_AFTER_LINK)
|
||||
@$(RM) foodummyfilefoo $(DELETE_AFTER_LINK)
|
||||
chmod +x $@
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
@ -1302,7 +1302,7 @@ endif
|
||||
ifdef STRICT_CPLUSPLUS_SUFFIX
|
||||
echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > t_$*.cc
|
||||
$(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) t_$*.cc
|
||||
rm -f t_$*.cc
|
||||
$(RM) t_$*.cc
|
||||
else
|
||||
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
|
||||
endif #STRICT_CPLUSPLUS_SUFFIX
|
||||
@ -1352,12 +1352,14 @@ endif
|
||||
|
||||
# need 3 separate lines for OS/2
|
||||
%:: %.pl
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
cp $< $@
|
||||
chmod +x $@
|
||||
|
||||
%:: %.sh
|
||||
rm -f $@; cp $< $@; chmod +x $@
|
||||
$(RM) $@
|
||||
cp $< $@
|
||||
chmod +x $@
|
||||
|
||||
# Cancel these implicit rules
|
||||
#
|
||||
@ -1547,8 +1549,8 @@ $(IDL_DIR)::
|
||||
# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
|
||||
# warn against overriding existing .h file.
|
||||
$(XPIDL_GEN_DIR)/.done:
|
||||
@if test ! -d $(XPIDL_GEN_DIR); then echo Creating $(XPIDL_GEN_DIR)/.done; rm -rf $(XPIDL_GEN_DIR); mkdir $(XPIDL_GEN_DIR); fi
|
||||
@touch $@
|
||||
$(MKDIR) -p $(XPIDL_GEN_DIR)
|
||||
@$(TOUCH) $@
|
||||
|
||||
# don't depend on $(XPIDL_GEN_DIR), because the modification date changes
|
||||
# with any addition to the directory, regenerating all .h files -> everything.
|
||||
@ -1802,7 +1804,7 @@ $(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
|
||||
endif
|
||||
|
||||
libs::
|
||||
$(RM) -rf "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(RM) -r "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(NSINSTALL) -D "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - . | (cd "../../bin/extensions/$(INSTALL_EXTENSION_ID)" && tar -xf -)
|
||||
|
||||
@ -1874,7 +1876,7 @@ endif
|
||||
$(LOOP_OVER_TOOL_DIRS)
|
||||
|
||||
dependclean:: $(SUBMAKEFILES)
|
||||
rm -f $(MDDEPFILES)
|
||||
$(RM) $(MDDEPFILES)
|
||||
$(LOOP_OVER_PARALLEL_DIRS)
|
||||
$(LOOP_OVER_DIRS)
|
||||
$(LOOP_OVER_TOOL_DIRS)
|
||||
@ -1897,7 +1899,7 @@ endif # COMPILER_DEPEND
|
||||
# it.
|
||||
|
||||
$(CURDIR)/$(MDDEPDIR):
|
||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
|
||||
$(MKDIR) -p $@
|
||||
|
||||
ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
|
||||
ifneq (,$(OBJS)$(XPIDLSRCS)$(SIMPLE_PROGRAMS))
|
||||
|
||||
43
configure.in
43
configure.in
@ -2007,6 +2007,8 @@ fi
|
||||
AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
|
||||
AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
|
||||
|
||||
MOZ_DOING_LTO(lto_is_enabled)
|
||||
|
||||
dnl ========================================================
|
||||
dnl System overrides of the defaults for target
|
||||
dnl ========================================================
|
||||
@ -2108,9 +2110,11 @@ case "$target" in
|
||||
# builds.
|
||||
MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"
|
||||
|
||||
if test "x$lto_is_enabled" = "xyes"; then
|
||||
echo "Skipping -dead_strip because lto is enabled."
|
||||
dnl DTrace and -dead_strip don't interact well. See bug 403132.
|
||||
dnl ===================================================================
|
||||
if test "x$enable_dtrace" = "xyes"; then
|
||||
elif test "x$enable_dtrace" = "xyes"; then
|
||||
echo "Skipping -dead_strip because DTrace is enabled. See bug 403132."
|
||||
else
|
||||
dnl check for the presence of the -dead_strip linker flag
|
||||
@ -6486,49 +6490,12 @@ if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
|
||||
fi
|
||||
|
||||
dnl This might be temporary: build tridentprofile only on Windows
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then
|
||||
AC_MSG_WARN([tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|tridentprofile||'`
|
||||
fi
|
||||
|
||||
dnl cookie must be built before tridentprofile. put it at list's end.
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0; then
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|tridentprofile||'`
|
||||
MOZ_EXTENSIONS="$MOZ_EXTENSIONS tridentprofile"
|
||||
fi
|
||||
|
||||
dnl xforms requires xtf
|
||||
if test -z "$MOZ_XTF" -a `echo "$MOZ_EXTENSIONS" | grep -c xforms` -ne 0; then
|
||||
AC_MSG_WARN([Cannot build XForms without XTF support. Removing XForms from MOZ_EXTENSIONS.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xforms||g'`
|
||||
fi
|
||||
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c auth` -ne 0; then
|
||||
AC_MSG_WARN([auth is no longer an extension, use --disable-negotiateauth to disable.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|auth||g'`
|
||||
fi
|
||||
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c 'cookie\|permissions'` -ne 0; then
|
||||
AC_MSG_WARN([cookie and permissions are no longer extensions, use --disable-permissions to disable.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|cookie||g; s|permissions||g'`
|
||||
fi
|
||||
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c pref` -ne 0; then
|
||||
AC_MSG_WARN([pref is no longer an extension, use --disable-pref-extensions to disable.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|pref||g'`
|
||||
fi
|
||||
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c universalchardet` -ne 0; then
|
||||
AC_MSG_WARN([universalchardet is no longer an extension, use --disable-universalchardet to disable.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|universalchardet||g'`
|
||||
fi
|
||||
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c spellcheck` -ne 0; then
|
||||
AC_MSG_WARN([spellcheck is no longer an extension.])
|
||||
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|spellcheck||g'`
|
||||
fi
|
||||
|
||||
dnl Remove dupes
|
||||
MOZ_EXTENSIONS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_EXTENSIONS}`
|
||||
|
||||
|
||||
@ -658,11 +658,11 @@ DIST_GARBAGE = config.cache config.log config.status \
|
||||
|
||||
distclean::
|
||||
cat unallmakefiles | $(XARGS) rm -f
|
||||
rm -f $(DIST_GARBAGE)
|
||||
$(RM) $(DIST_GARBAGE)
|
||||
|
||||
# our build system doesn't handle subdir srcs very gracefully today
|
||||
export::
|
||||
mkdir -p nanojit
|
||||
$(MKDIR) -p nanojit
|
||||
|
||||
DEFINES += -DEXPORT_JS_API
|
||||
|
||||
@ -817,14 +817,14 @@ export:: jsautocfg.h
|
||||
|
||||
ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
|
||||
jsautocfg.h:
|
||||
touch $@
|
||||
$(TOUCH) $@
|
||||
else
|
||||
ifeq ($(OS_ARCH),WINCE)
|
||||
jsautocfg.h:
|
||||
touch $@
|
||||
$(TOUCH) $@
|
||||
else
|
||||
jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
|
||||
@rm -f $@ jsautocfg.tmp
|
||||
@$(RM) $@ jsautocfg.tmp
|
||||
./jscpucfg > jsautocfg.tmp
|
||||
mv jsautocfg.tmp $@
|
||||
endif
|
||||
@ -884,7 +884,7 @@ JS_CONFIG_LIBS=$(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS)
|
||||
# this rule.
|
||||
at=@
|
||||
js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
|
||||
rm -f js-config.tmp
|
||||
$(RM) js-config.tmp
|
||||
sed < $< > js-config.tmp \
|
||||
-e 's|$(at)prefix$(at)|$(prefix)|' \
|
||||
-e 's|$(at)exec_prefix$(at)|$(exec_prefix)|' \
|
||||
@ -960,7 +960,7 @@ NANOJIT_CENTRAL_LOCAL=$(CURDIR)/nanojit-central
|
||||
CUR_REPO=$(srcdir)/../..
|
||||
|
||||
update-nanojit:
|
||||
rm -Rf $(NANOJIT_CENTRAL_LOCAL) import-splicemap import-revmap
|
||||
$(RM) -r $(NANOJIT_CENTRAL_LOCAL) import-splicemap import-revmap
|
||||
hg clone $(NANOJIT_CENTRAL_REPO) $(NANOJIT_CENTRAL_LOCAL)
|
||||
python $(srcdir)/find-child.py \
|
||||
--src=$(NANOJIT_CENTRAL_LOCAL) \
|
||||
|
||||
1
js/src/aclocal.m4
vendored
1
js/src/aclocal.m4
vendored
@ -9,5 +9,6 @@ builtin(include, build/autoconf/altoptions.m4)dnl
|
||||
builtin(include, build/autoconf/moznbytetype.m4)dnl
|
||||
builtin(include, build/autoconf/mozprog.m4)dnl
|
||||
builtin(include, build/autoconf/acwinpaths.m4)dnl
|
||||
builtin(include, build/autoconf/lto.m4)dnl
|
||||
|
||||
MOZ_PROG_CHECKMSYS()
|
||||
|
||||
15
js/src/build/autoconf/lto.m4
Normal file
15
js/src/build/autoconf/lto.m4
Normal file
@ -0,0 +1,15 @@
|
||||
dnl check if the build is using lto. This is really primitive and only detects llvm based
|
||||
dnl compilers right now.
|
||||
AC_DEFUN(MOZ_DOING_LTO,
|
||||
[
|
||||
cat > conftest.c <<EOF
|
||||
int foo = 1;
|
||||
EOF
|
||||
$1=no
|
||||
if ${CC-cc} ${CFLAGS} -S conftest.c -o conftest.s >/dev/null 2>&1; then
|
||||
if grep '^target triple =' conftest.s; then
|
||||
$1=yes
|
||||
fi
|
||||
fi
|
||||
rm -f conftest.[cs]
|
||||
])
|
||||
@ -159,6 +159,9 @@ endif
|
||||
|
||||
CC := $(CC_WRAPPER) $(CC)
|
||||
CXX := $(CXX_WRAPPER) $(CXX)
|
||||
MKDIR ?= mkdir
|
||||
SLEEP ?= sleep
|
||||
TOUCH ?= touch
|
||||
|
||||
# determine debug-related options
|
||||
_DEBUG_CFLAGS :=
|
||||
|
||||
@ -934,24 +934,24 @@ checkout:
|
||||
$(MAKE) -C $(topsrcdir) -f client.mk checkout
|
||||
|
||||
clean clobber realclean clobber_all:: $(SUBMAKEFILES)
|
||||
-rm -f $(ALL_TRASH)
|
||||
-rm -rf $(ALL_TRASH_DIRS)
|
||||
-$(RM) $(ALL_TRASH)
|
||||
-$(RM) -r $(ALL_TRASH_DIRS)
|
||||
$(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir)))
|
||||
|
||||
distclean:: $(SUBMAKEFILES)
|
||||
$(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir)))
|
||||
-rm -rf $(ALL_TRASH_DIRS)
|
||||
-rm -f $(ALL_TRASH) \
|
||||
-$(RM) -r $(ALL_TRASH_DIRS)
|
||||
-$(RM) $(ALL_TRASH) \
|
||||
Makefile .HSancillary \
|
||||
$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \
|
||||
$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
|
||||
$(wildcard *.$(IMPORT_LIB_SUFFIX))
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
-rm -f $(PROGRAM:.exe=.map)
|
||||
-$(RM) $(PROGRAM:.exe=.map)
|
||||
endif
|
||||
|
||||
alltags:
|
||||
rm -f TAGS
|
||||
$(RM) TAGS
|
||||
find $(topsrcdir) -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' -o -name '*.idl' \) -print | $(TAG_PROGRAM)
|
||||
|
||||
#
|
||||
@ -959,7 +959,7 @@ alltags:
|
||||
# creates OBJS, links with LIBS to create Foo
|
||||
#
|
||||
$(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
|
||||
@rm -f $@.manifest
|
||||
@$(RM) $@.manifest
|
||||
ifeq (WINCE,$(OS_ARCH))
|
||||
$(EXPAND_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
else
|
||||
@ -1110,7 +1110,7 @@ EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
||||
endif
|
||||
|
||||
$(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
||||
rm -f $(LIBRARY)
|
||||
$(RM) $(LIBRARY)
|
||||
$(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS)
|
||||
$(RANLIB) $@
|
||||
|
||||
@ -1123,7 +1123,7 @@ endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
$(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
echo LIBRARY $(SHARED_LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $@
|
||||
echo PROTMODE >> $@
|
||||
echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@
|
||||
@ -1133,13 +1133,13 @@ $(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
|
||||
$(ADD_TO_DEF_FILE)
|
||||
|
||||
$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
$(IMPLIB) $@ $^
|
||||
$(RANLIB) $@
|
||||
endif # OS/2
|
||||
|
||||
$(HOST_LIBRARY): $(HOST_OBJS) Makefile
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
$(HOST_AR) $(HOST_AR_FLAGS) $(HOST_OBJS)
|
||||
$(HOST_RANLIB) $@
|
||||
|
||||
@ -1161,14 +1161,14 @@ endif
|
||||
|
||||
$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
|
||||
ifndef INCREMENTAL_LINKER
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
endif
|
||||
ifdef DTRACE_LIB_DEPENDENT
|
||||
ifndef XP_MACOSX
|
||||
dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
|
||||
endif
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
||||
@rm -f $(DTRACE_PROBE_OBJ)
|
||||
@$(RM) $(DTRACE_PROBE_OBJ)
|
||||
else # ! DTRACE_LIB_DEPENDENT
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
||||
endif # DTRACE_LIB_DEPENDENT
|
||||
@ -1186,7 +1186,7 @@ ifdef MOZ_PROFILE_GENERATE
|
||||
touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
|
||||
endif
|
||||
endif # WINNT && !GCC
|
||||
@rm -f foodummyfilefoo $(DELETE_AFTER_LINK)
|
||||
@$(RM) foodummyfilefoo $(DELETE_AFTER_LINK)
|
||||
chmod +x $@
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
@ -1302,7 +1302,7 @@ endif
|
||||
ifdef STRICT_CPLUSPLUS_SUFFIX
|
||||
echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > t_$*.cc
|
||||
$(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) t_$*.cc
|
||||
rm -f t_$*.cc
|
||||
$(RM) t_$*.cc
|
||||
else
|
||||
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
|
||||
endif #STRICT_CPLUSPLUS_SUFFIX
|
||||
@ -1352,12 +1352,14 @@ endif
|
||||
|
||||
# need 3 separate lines for OS/2
|
||||
%:: %.pl
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
cp $< $@
|
||||
chmod +x $@
|
||||
|
||||
%:: %.sh
|
||||
rm -f $@; cp $< $@; chmod +x $@
|
||||
$(RM) $@
|
||||
cp $< $@
|
||||
chmod +x $@
|
||||
|
||||
# Cancel these implicit rules
|
||||
#
|
||||
@ -1547,8 +1549,8 @@ $(IDL_DIR)::
|
||||
# generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
|
||||
# warn against overriding existing .h file.
|
||||
$(XPIDL_GEN_DIR)/.done:
|
||||
@if test ! -d $(XPIDL_GEN_DIR); then echo Creating $(XPIDL_GEN_DIR)/.done; rm -rf $(XPIDL_GEN_DIR); mkdir $(XPIDL_GEN_DIR); fi
|
||||
@touch $@
|
||||
$(MKDIR) -p $(XPIDL_GEN_DIR)
|
||||
@$(TOUCH) $@
|
||||
|
||||
# don't depend on $(XPIDL_GEN_DIR), because the modification date changes
|
||||
# with any addition to the directory, regenerating all .h files -> everything.
|
||||
@ -1802,7 +1804,7 @@ $(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
|
||||
endif
|
||||
|
||||
libs::
|
||||
$(RM) -rf "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(RM) -r "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
$(NSINSTALL) -D "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
|
||||
cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - . | (cd "../../bin/extensions/$(INSTALL_EXTENSION_ID)" && tar -xf -)
|
||||
|
||||
@ -1874,7 +1876,7 @@ endif
|
||||
$(LOOP_OVER_TOOL_DIRS)
|
||||
|
||||
dependclean:: $(SUBMAKEFILES)
|
||||
rm -f $(MDDEPFILES)
|
||||
$(RM) $(MDDEPFILES)
|
||||
$(LOOP_OVER_PARALLEL_DIRS)
|
||||
$(LOOP_OVER_DIRS)
|
||||
$(LOOP_OVER_TOOL_DIRS)
|
||||
@ -1897,7 +1899,7 @@ endif # COMPILER_DEPEND
|
||||
# it.
|
||||
|
||||
$(CURDIR)/$(MDDEPDIR):
|
||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
|
||||
$(MKDIR) -p $@
|
||||
|
||||
ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
|
||||
ifneq (,$(OBJS)$(XPIDLSRCS)$(SIMPLE_PROGRAMS))
|
||||
|
||||
@ -1886,6 +1886,8 @@ if test "$_python_res" != 0; then
|
||||
fi
|
||||
AC_MSG_RESULT([yes])
|
||||
|
||||
MOZ_DOING_LTO(lto_is_enabled)
|
||||
|
||||
dnl ========================================================
|
||||
dnl System overrides of the defaults for target
|
||||
dnl ========================================================
|
||||
@ -1990,9 +1992,11 @@ case "$target" in
|
||||
# builds.
|
||||
MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"
|
||||
|
||||
if test "x$lto_is_enabled" = "xyes"; then
|
||||
echo "Skipping -dead_strip because lto is enabled."
|
||||
dnl DTrace and -dead_strip don't interact well. See bug 403132.
|
||||
dnl ===================================================================
|
||||
if test "x$enable_dtrace" = "xyes"; then
|
||||
elif test "x$enable_dtrace" = "xyes"; then
|
||||
echo "Skipping -dead_strip because DTrace is enabled. See bug 403132."
|
||||
else
|
||||
dnl check for the presence of the -dead_strip linker flag
|
||||
|
||||
Loading…
Reference in New Issue
Block a user