Bug 407399 - Disable prebinding for trunk builds, drop support from comm-central tree part, r=kairo
This commit is contained in:
Родитель
c4e48929f6
Коммит
bc4fce48c9
|
@ -228,9 +228,6 @@ endif
|
|||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
LIBS += -framework QuickTime -framework IOKit
|
||||
ifdef USE_PREBINDING
|
||||
BIN_FLAGS += -Wl,-headerpad -Wl,5a0c
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
@ -112,7 +112,6 @@ EAZEL_PROFILER_LIBS=@EAZEL_PROFILER_LIBS@
|
|||
GC_LEAK_DETECTOR = @GC_LEAK_DETECTOR@
|
||||
NS_TRACE_MALLOC = @NS_TRACE_MALLOC@
|
||||
USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
|
||||
USE_PREBINDING = @USE_PREBINDING@
|
||||
INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
|
||||
MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
|
||||
MOZ_MAIL_NEWS = @MOZ_MAIL_NEWS@
|
||||
|
|
|
@ -656,10 +656,6 @@ endif
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
ifdef USE_PREBINDING
|
||||
export LD_PREBIND=1
|
||||
export LD_SEG_ADDR_TABLE=$(shell cd $(MOZILLA_SRCDIR); pwd)/config/prebind-address-table
|
||||
endif # USE_PREBINDING
|
||||
ifdef NEXT_ROOT
|
||||
export NEXT_ROOT
|
||||
PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
|
||||
|
|
|
@ -6079,14 +6079,6 @@ if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
|
|||
fi
|
||||
fi # COMPILE_ENVIRONMENT
|
||||
|
||||
dnl ========================================================
|
||||
dnl = --enable-prebinding
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(prebinding,
|
||||
[ --enable-prebinding Enable prebinding (Mac OS X only)],
|
||||
USE_PREBINDING=1,
|
||||
USE_PREBINDING= )
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Profiling and Instrumenting
|
||||
|
@ -7201,7 +7193,6 @@ AC_SUBST(MOZ_CRASHREPORTER)
|
|||
AC_SUBST(ENABLE_STRIP)
|
||||
AC_SUBST(PKG_SKIP_STRIP)
|
||||
AC_SUBST(USE_ELF_DYNSTR_GC)
|
||||
AC_SUBST(USE_PREBINDING)
|
||||
AC_SUBST(INCREMENTAL_LINKER)
|
||||
AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
|
||||
AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
|
||||
|
|
Загрузка…
Ссылка в новой задаче