зеркало из https://github.com/mozilla/pjs.git
merge backout. CLOSED TREE
This commit is contained in:
Jim Mathies
Коммит
b76cd9fe94
|
|
@ -92,11 +92,12 @@ MOZ_PANGO = @MOZ_PANGO@
|
|||
MOZ_JS_LIBS = @MOZ_JS_LIBS@
|
||||
|
||||
MOZ_DEBUG = @MOZ_DEBUG@
|
||||
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
||||
MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
|
||||
MOZ_DEBUG_ENABLE_DEFS = @MOZ_DEBUG_ENABLE_DEFS@
|
||||
MOZ_DEBUG_DISABLE_DEFS = @MOZ_DEBUG_DISABLE_DEFS@
|
||||
MOZ_DEBUG_FLAGS = @MOZ_DEBUG_FLAGS@
|
||||
MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
|
||||
MOZ_DBGRINFO_MODULES = @MOZ_DBGRINFO_MODULES@
|
||||
MOZ_EXTENSIONS = @MOZ_EXTENSIONS@
|
||||
MOZ_IMG_DECODERS= @MOZ_IMG_DECODERS@
|
||||
MOZ_IMG_ENCODERS= @MOZ_IMG_ENCODERS@
|
||||
|
|
@ -590,6 +591,7 @@ MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
|
|||
# Win32 options
|
||||
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
||||
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
||||
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
||||
MOZ_QUANTIFY = @MOZ_QUANTIFY@
|
||||
MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
|
||||
WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
|
||||
|
|
|
|||
|
|
@ -162,21 +162,73 @@ endif
|
|||
_DEBUG_CFLAGS :=
|
||||
_DEBUG_LDFLAGS :=
|
||||
|
||||
ifndef MOZ_DEBUG
|
||||
# global debugging is disabled
|
||||
# check if it was explicitly enabled for this module
|
||||
ifneq (, $(findstring $(MODULE), $(MOZ_DEBUG_MODULES)))
|
||||
MOZ_DEBUG:=1
|
||||
endif
|
||||
else
|
||||
# global debugging is enabled
|
||||
# check if it was explicitly disabled for this module
|
||||
ifneq (, $(findstring ^$(MODULE), $(MOZ_DEBUG_MODULES)))
|
||||
MOZ_DEBUG:=
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS) $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS)
|
||||
XULPPFLAGS += $(MOZ_DEBUG_ENABLE_DEFS)
|
||||
else
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_DISABLE_DEFS)
|
||||
XULPPFLAGS += $(MOZ_DEBUG_DISABLE_DEFS)
|
||||
ifdef MOZ_DEBUG_SYMBOLS
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
endif
|
||||
|
||||
# determine if -g should be passed to the compiler, based on
|
||||
# the current module, and the value of MOZ_DBGRINFO_MODULES
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
MOZ_DBGRINFO_MODULES += ALL_MODULES
|
||||
pattern := ALL_MODULES ^ALL_MODULES
|
||||
else
|
||||
MOZ_DBGRINFO_MODULES += ^ALL_MODULES
|
||||
pattern := ALL_MODULES ^ALL_MODULES
|
||||
endif
|
||||
|
||||
ifdef MODULE
|
||||
# our current Makefile specifies a module name - add it to our pattern
|
||||
pattern += $(MODULE) ^$(MODULE)
|
||||
endif
|
||||
|
||||
# start by finding the first relevant module name
|
||||
# (remember that the order of the module names in MOZ_DBGRINFO_MODULES
|
||||
# is reversed from the order the user specified to configure -
|
||||
# this allows the user to put general names at the beginning
|
||||
# of the list, and to override them with explicit module names later
|
||||
# in the list)
|
||||
|
||||
first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES)))
|
||||
|
||||
ifeq ($(first_match), $(MODULE))
|
||||
# the user specified explicitly that
|
||||
# this module should be compiled with -g
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
else
|
||||
ifneq ($(first_match), ^$(MODULE))
|
||||
ifeq ($(first_match), ALL_MODULES)
|
||||
# the user didn't mention this module explicitly,
|
||||
# but wanted all modules to be compiled with -g
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
MOZALLOC_LIB = $(call EXPAND_MOZLIBNAME,mozalloc)
|
||||
|
||||
# append debug flags
|
||||
# (these might have been above when processing MOZ_DBGRINFO_MODULES)
|
||||
OS_CFLAGS += $(_DEBUG_CFLAGS)
|
||||
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
||||
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
|
||||
|
|
|
|||
66
configure.in
66
configure.in
|
|
@ -2016,7 +2016,7 @@ case "$target" in
|
|||
# -Os has been broken on Intel's C/C++ compilers for quite a
|
||||
# while; Intel recommends against using it.
|
||||
MOZ_OPTIMIZE_FLAGS="-O2"
|
||||
MOZ_DEBUG_FLAGS="-g"
|
||||
MOZ_DEBUG_FLAGS="-g -fno-inline"
|
||||
elif test "$GNU_CC" || test "$GNU_CXX"; then
|
||||
GCC_VERSION=`$CC -v 2>&1 | awk '/^gcc version/ { print $3 }'`
|
||||
case $GCC_VERSION in
|
||||
|
|
@ -2025,7 +2025,11 @@ case "$target" in
|
|||
MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50"
|
||||
esac
|
||||
MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_SIZE_TWEAK"
|
||||
MOZ_DEBUG_FLAGS="-g"
|
||||
MOZ_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb,
|
||||
# and that combo is not yet good at
|
||||
# debugging inlined functions (even
|
||||
# when using DWARF2 as the debugging
|
||||
# format)
|
||||
fi
|
||||
|
||||
TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
|
||||
|
|
@ -4691,6 +4695,7 @@ ENABLE_TESTS=1
|
|||
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
|
||||
MOZ_BRANDING_DIRECTORY=
|
||||
MOZ_OFFICIAL_BRANDING=
|
||||
MOZ_DBGRINFO_MODULES=
|
||||
MOZ_FEEDS=1
|
||||
MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp icon"
|
||||
MOZ_IMG_ENCODERS_DEFAULT="png jpeg"
|
||||
|
|
@ -6637,12 +6642,11 @@ fi
|
|||
|
||||
MOZ_ARG_ENABLE_STRING(debug,
|
||||
[ --enable-debug[=DBG] Enable building with developer debug info
|
||||
(using compiler flags DBG)],
|
||||
(Using compiler flags DBG)],
|
||||
[ if test "$enableval" != "no"; then
|
||||
MOZ_DEBUG=1
|
||||
if test -n "$enableval" -a "$enableval" != "yes"; then
|
||||
if test -n "$enableval" && test "$enableval" != "yes"; then
|
||||
MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
|
||||
_MOZ_DEBUG_FLAGS_SET=1
|
||||
fi
|
||||
else
|
||||
MOZ_DEBUG=
|
||||
|
|
@ -6736,37 +6740,33 @@ AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
|
|||
AC_SUBST(MOZ_OPTIMIZE_SIZE_TWEAK)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = (Deprecated) generation of debugger info for specific modules
|
||||
dnl = Enable/disable debug for specific modules only
|
||||
dnl = module names beginning with ^ will be disabled
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_STRING(debug-modules,
|
||||
[ --enable-debug-modules Enable/disable debug info for specific modules],
|
||||
[ MOZ_DEBUG_MODULES=`echo $enableval| sed 's/,/ /g'` ] )
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable/disable generation of debugger info for specific modules only
|
||||
dnl = the special module name ALL_MODULES can be used to denote all modules
|
||||
dnl = module names beginning with ^ will be disabled
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_STRING(debugger-info-modules,
|
||||
[ --enable-debugger-info-modules
|
||||
Enable/disable debugger info for specific modules],
|
||||
[ if test "$enableval" != "no"; then
|
||||
AC_MSG_WARN([--enable-debugger-info-modules is deprecated, use --enable-debug-symbols instead])
|
||||
MOZ_DEBUG_SYMBOLS=1
|
||||
fi ])
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable generation of debug symbols
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_STRING(debug-symbols,
|
||||
[ --enable-debug-symbols[=DBG] Enable debugging symbols
|
||||
(using compiler flags DBG)],
|
||||
[ if test "$enableval" != "no"; then
|
||||
MOZ_DEBUG_SYMBOLS=1
|
||||
if test -n "$enableval" -a "$enableval" != "yes"; then
|
||||
if test -z "$_MOZ_DEBUG_FLAGS_SET"; then
|
||||
MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
|
||||
else
|
||||
AC_MSG_ERROR([--enable-debug-symbols flags cannot be used with --enable-debug flags])
|
||||
fi
|
||||
[ for i in `echo $enableval | sed 's/,/ /g'`; do
|
||||
dnl note that the list of module names is reversed as it is copied
|
||||
dnl this is important, as it will allow config.mk to interpret stuff like
|
||||
dnl "^ALL_MODULES xpcom" properly
|
||||
if test "$i" = "no"; then
|
||||
i="^ALL_MODULES"
|
||||
fi
|
||||
fi ])
|
||||
|
||||
if test -n "$MOZ_DEBUG" -o -n "$MOZ_DEBUG_SYMBOLS"; then
|
||||
AC_DEFINE(MOZ_DEBUG_SYMBOLS)
|
||||
export MOZ_DEBUG_SYMBOLS
|
||||
fi
|
||||
if test "$i" = "yes"; then
|
||||
i="ALL_MODULES"
|
||||
fi
|
||||
MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES";
|
||||
done ])
|
||||
|
||||
dnl ========================================================
|
||||
dnl Disable runtime logging checks
|
||||
|
|
@ -8173,12 +8173,13 @@ AC_SUBST(MOZ_XSLT_STANDALONE)
|
|||
AC_SUBST(MOZ_JS_LIBS)
|
||||
AC_SUBST(MOZ_PSM)
|
||||
AC_SUBST(MOZ_DEBUG)
|
||||
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
||||
AC_SUBST(MOZ_DEBUG_MODULES)
|
||||
AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
|
||||
AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
|
||||
AC_SUBST(MOZ_DEBUG_FLAGS)
|
||||
AC_SUBST(MOZ_DEBUG_LDFLAGS)
|
||||
AC_SUBST(WARNINGS_AS_ERRORS)
|
||||
AC_SUBST(MOZ_DBGRINFO_MODULES)
|
||||
AC_SUBST(MOZ_EXTENSIONS)
|
||||
AC_SUBST(MOZ_IMG_DECODERS)
|
||||
AC_SUBST(MOZ_IMG_ENCODERS)
|
||||
|
|
@ -8267,6 +8268,7 @@ AC_SUBST(MOZ_PKG_SPECIAL)
|
|||
AC_SUBST(MOZILLA_OFFICIAL)
|
||||
|
||||
dnl win32 options
|
||||
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
||||
AC_SUBST(MOZ_MAPINFO)
|
||||
AC_SUBST(MOZ_BROWSE_INFO)
|
||||
AC_SUBST(MOZ_TOOLS_DIR)
|
||||
|
|
|
|||
|
|
@ -76,12 +76,13 @@ MOZ_JS_LIBS = @MOZ_JS_LIBS@
|
|||
MOZ_SYNC_BUILD_FILES = @MOZ_SYNC_BUILD_FILES@
|
||||
|
||||
MOZ_DEBUG = @MOZ_DEBUG@
|
||||
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
||||
MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
|
||||
MOZ_PROFILE_MODULES = @MOZ_PROFILE_MODULES@
|
||||
MOZ_DEBUG_ENABLE_DEFS = @MOZ_DEBUG_ENABLE_DEFS@
|
||||
MOZ_DEBUG_DISABLE_DEFS = @MOZ_DEBUG_DISABLE_DEFS@
|
||||
MOZ_DEBUG_FLAGS = @MOZ_DEBUG_FLAGS@
|
||||
MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
|
||||
MOZ_DBGRINFO_MODULES = @MOZ_DBGRINFO_MODULES@
|
||||
MOZ_EXTENSIONS = @MOZ_EXTENSIONS@
|
||||
MOZ_IMG_DECODERS= @MOZ_IMG_DECODERS@
|
||||
MOZ_IMG_ENCODERS= @MOZ_IMG_ENCODERS@
|
||||
|
|
@ -316,6 +317,7 @@ MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
|
|||
# Win32 options
|
||||
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
||||
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
||||
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
||||
MOZ_QUANTIFY = @MOZ_QUANTIFY@
|
||||
MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
|
||||
WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
|
||||
|
|
|
|||
|
|
@ -162,21 +162,73 @@ endif
|
|||
_DEBUG_CFLAGS :=
|
||||
_DEBUG_LDFLAGS :=
|
||||
|
||||
ifndef MOZ_DEBUG
|
||||
# global debugging is disabled
|
||||
# check if it was explicitly enabled for this module
|
||||
ifneq (, $(findstring $(MODULE), $(MOZ_DEBUG_MODULES)))
|
||||
MOZ_DEBUG:=1
|
||||
endif
|
||||
else
|
||||
# global debugging is enabled
|
||||
# check if it was explicitly disabled for this module
|
||||
ifneq (, $(findstring ^$(MODULE), $(MOZ_DEBUG_MODULES)))
|
||||
MOZ_DEBUG:=
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS) $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS)
|
||||
XULPPFLAGS += $(MOZ_DEBUG_ENABLE_DEFS)
|
||||
else
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_DISABLE_DEFS)
|
||||
XULPPFLAGS += $(MOZ_DEBUG_DISABLE_DEFS)
|
||||
ifdef MOZ_DEBUG_SYMBOLS
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
endif
|
||||
|
||||
# determine if -g should be passed to the compiler, based on
|
||||
# the current module, and the value of MOZ_DBGRINFO_MODULES
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
MOZ_DBGRINFO_MODULES += ALL_MODULES
|
||||
pattern := ALL_MODULES ^ALL_MODULES
|
||||
else
|
||||
MOZ_DBGRINFO_MODULES += ^ALL_MODULES
|
||||
pattern := ALL_MODULES ^ALL_MODULES
|
||||
endif
|
||||
|
||||
ifdef MODULE
|
||||
# our current Makefile specifies a module name - add it to our pattern
|
||||
pattern += $(MODULE) ^$(MODULE)
|
||||
endif
|
||||
|
||||
# start by finding the first relevant module name
|
||||
# (remember that the order of the module names in MOZ_DBGRINFO_MODULES
|
||||
# is reversed from the order the user specified to configure -
|
||||
# this allows the user to put general names at the beginning
|
||||
# of the list, and to override them with explicit module names later
|
||||
# in the list)
|
||||
|
||||
first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES)))
|
||||
|
||||
ifeq ($(first_match), $(MODULE))
|
||||
# the user specified explicitly that
|
||||
# this module should be compiled with -g
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
else
|
||||
ifneq ($(first_match), ^$(MODULE))
|
||||
ifeq ($(first_match), ALL_MODULES)
|
||||
# the user didn't mention this module explicitly,
|
||||
# but wanted all modules to be compiled with -g
|
||||
_DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
|
||||
_DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
MOZALLOC_LIB = $(call EXPAND_MOZLIBNAME,mozalloc)
|
||||
|
||||
# append debug flags
|
||||
# (these might have been above when processing MOZ_DBGRINFO_MODULES)
|
||||
OS_CFLAGS += $(_DEBUG_CFLAGS)
|
||||
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
||||
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
|
||||
|
|
|
|||
|
|
@ -1793,7 +1793,7 @@ case "$target" in
|
|||
# -Os has been broken on Intel's C/C++ compilers for quite a
|
||||
# while; Intel recommends against using it.
|
||||
MOZ_OPTIMIZE_FLAGS="-O2"
|
||||
MOZ_DEBUG_FLAGS="-g"
|
||||
MOZ_DEBUG_FLAGS="-g -fno-inline"
|
||||
elif test "$GNU_CXX"; then
|
||||
GCC_VERSION=`$CXX -v 2>&1 | awk '/^gcc version/ { print $3 }'`
|
||||
case $GCC_VERSION in
|
||||
|
|
@ -1802,7 +1802,11 @@ case "$target" in
|
|||
MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50"
|
||||
esac
|
||||
MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_SIZE_TWEAK"
|
||||
MOZ_DEBUG_FLAGS="-g"
|
||||
MOZ_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb,
|
||||
# and that combo is not yet good at
|
||||
# debugging inlined functions (even
|
||||
# when using DWARF2 as the debugging
|
||||
# format)
|
||||
fi
|
||||
|
||||
TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
|
||||
|
|
@ -3908,6 +3912,7 @@ MOZ_ARG_HEADER(Application)
|
|||
|
||||
BUILD_STATIC_LIBS=
|
||||
ENABLE_TESTS=1
|
||||
MOZ_DBGRINFO_MODULES=
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
|
|
@ -3980,9 +3985,8 @@ MOZ_ARG_ENABLE_STRING(debug,
|
|||
(Using compiler flags DBG)],
|
||||
[ if test "$enableval" != "no"; then
|
||||
MOZ_DEBUG=1
|
||||
if test -n "$enableval" -a "$enableval" != "yes"; then
|
||||
if test -n "$enableval" && test "$enableval" != "yes"; then
|
||||
MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
|
||||
_MOZ_DEBUG_FLAGS_SET=1
|
||||
fi
|
||||
else
|
||||
MOZ_DEBUG=
|
||||
|
|
@ -4063,37 +4067,33 @@ AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
|
|||
AC_SUBST(MOZ_OPTIMIZE_SIZE_TWEAK)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = (Deprecated) generation of debugger info for specific modules
|
||||
dnl = Enable/disable debug for specific modules only
|
||||
dnl = module names beginning with ^ will be disabled
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_STRING(debug-modules,
|
||||
[ --enable-debug-modules Enable/disable debug info for specific modules],
|
||||
[ MOZ_DEBUG_MODULES=`echo $enableval| sed 's/,/ /g'` ] )
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable/disable generation of debugger info for specific modules only
|
||||
dnl = the special module name ALL_MODULES can be used to denote all modules
|
||||
dnl = module names beginning with ^ will be disabled
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_STRING(debugger-info-modules,
|
||||
[ --enable-debugger-info-modules
|
||||
Enable/disable debugger info for specific modules],
|
||||
[ if test "$enableval" != "no"; then
|
||||
AC_MSG_WARN([--enable-debugger-info-modules is deprecated, use --enable-debug-symbols instead])
|
||||
MOZ_DEBUG_SYMBOLS=1
|
||||
fi ])
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable generation of debug symbols
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_STRING(debug-symbols,
|
||||
[ --enable-debug-symbols[=DBG] Enable debugging symbols
|
||||
(using compiler flags DBG)],
|
||||
[ if test "$enableval" != "no"; then
|
||||
MOZ_DEBUG_SYMBOLS=1
|
||||
if test -n "$enableval" -a "$enableval" != "yes"; then
|
||||
if test -z "$_MOZ_DEBUG_FLAGS_SET"; then
|
||||
MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
|
||||
else
|
||||
AC_MSG_ERROR([--enable-debug-symbols flags cannot be used with --enable-debug flags])
|
||||
fi
|
||||
[ for i in `echo $enableval | sed 's/,/ /g'`; do
|
||||
dnl note that the list of module names is reversed as it is copied
|
||||
dnl this is important, as it will allow config.mk to interpret stuff like
|
||||
dnl "^ALL_MODULES xpcom" properly
|
||||
if test "$i" = "no"; then
|
||||
i="^ALL_MODULES"
|
||||
fi
|
||||
fi ])
|
||||
|
||||
if test -n "$MOZ_DEBUG" -o -n "$MOZ_DEBUG_SYMBOLS"; then
|
||||
AC_DEFINE(MOZ_DEBUG_SYMBOLS)
|
||||
export MOZ_DEBUG_SYMBOLS
|
||||
fi
|
||||
if test "$i" = "yes"; then
|
||||
i="ALL_MODULES"
|
||||
fi
|
||||
MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES";
|
||||
done ])
|
||||
|
||||
dnl ========================================================
|
||||
dnl Enable Narcissus
|
||||
|
|
@ -4873,12 +4873,13 @@ AC_SUBST(NS_USE_NATIVE)
|
|||
AC_SUBST(MOZ_JS_LIBS)
|
||||
AC_SUBST(MOZ_PSM)
|
||||
AC_SUBST(MOZ_DEBUG)
|
||||
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
||||
AC_SUBST(MOZ_DEBUG_MODULES)
|
||||
AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
|
||||
AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
|
||||
AC_SUBST(MOZ_DEBUG_FLAGS)
|
||||
AC_SUBST(MOZ_DEBUG_LDFLAGS)
|
||||
AC_SUBST(WARNINGS_AS_ERRORS)
|
||||
AC_SUBST(MOZ_DBGRINFO_MODULES)
|
||||
AC_SUBST(MOZ_LEAKY)
|
||||
AC_SUBST(MOZ_JPROF)
|
||||
AC_SUBST(MOZ_SHARK)
|
||||
|
|
@ -4925,6 +4926,7 @@ AC_SUBST(MOZ_PKG_SPECIAL)
|
|||
AC_SUBST(MOZILLA_OFFICIAL)
|
||||
|
||||
dnl win32 options
|
||||
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
||||
AC_SUBST(MOZ_MAPINFO)
|
||||
AC_SUBST(MOZ_BROWSE_INFO)
|
||||
AC_SUBST(MOZ_TOOLS_DIR)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче