mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Disable prebinding for trunk builds, drop support from mozilla-central tree part, r=ted
This commit is contained in:
parent
bb1a2f1351
commit
87c60313c6
@ -231,14 +231,6 @@ include $(topsrcdir)/config/static-rules.mk
|
||||
DEFINES += -DIMPL_XREAPI
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
ifdef USE_PREBINDING
|
||||
BIN_FLAGS += -Wl,-headerpad -Wl,5a0c
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
|
||||
LIBS += -lphexlib
|
||||
endif
|
||||
|
@ -114,7 +114,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@
|
||||
|
@ -661,10 +661,6 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
ifdef USE_PREBINDING
|
||||
export LD_PREBIND=1
|
||||
export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
||||
endif # USE_PREBINDING
|
||||
ifdef NEXT_ROOT
|
||||
export NEXT_ROOT
|
||||
PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
|
||||
|
@ -1,25 +0,0 @@
|
||||
# Prebinding address table
|
||||
#
|
||||
# Prebinding results in improved launch times on Mac OS X <= 10.3.3. It's
|
||||
# unnecessary when targeting >= 10.3.4.
|
||||
#
|
||||
# 0x0 to 0x4fffffff is available to the application since Mac OS X 10.2.
|
||||
# See http://developer.apple.com/documentation/Performance/Conceptual/LaunchTime/Articles/Prebinding.html
|
||||
#
|
||||
# Begin at 0x20000000, leaving space at 0x0 for the main executable image,
|
||||
# which can be large in a static debug build.
|
||||
|
||||
0x20000000 @executable_path/libnspr4.dylib
|
||||
0x21000000 @executable_path/libplds4.dylib
|
||||
0x22000000 @executable_path/libplc4.dylib
|
||||
0x23000000 @executable_path/libmozjs.dylib
|
||||
0x24000000 @executable_path/libxpcom.dylib
|
||||
0x25000000 @executable_path/libssl3.dylib
|
||||
0x26000000 @executable_path/libnss3.dylib
|
||||
0x27000000 @executable_path/libsmime3.dylib
|
||||
0x28000000 @executable_path/libsoftokn3.dylib
|
||||
0x29000000 @executable_path/libxpcom_compat.dylib
|
||||
0x2a000000 @executable_path/libprldap50.dylib
|
||||
0x2b000000 @executable_path/libldap50.dylib
|
||||
0x2c000000 @executable_path/libxpcom_core.dylib
|
||||
0x2d000000 @executable_path/XUL
|
@ -6528,14 +6528,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
|
||||
@ -7838,7 +7830,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)
|
||||
|
Loading…
Reference in New Issue
Block a user