mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 384513 - make the visibility pragma checks aware of mach-o and not just ELF, and re-enable libxul by default, r=mento+shebs
This commit is contained in:
parent
1daaf9dc7b
commit
0b85a560e2
@ -40,17 +40,7 @@ MOZ_APP_NAME=firefox
|
||||
MOZ_UPDATER=1
|
||||
MOZ_PHOENIX=1
|
||||
|
||||
case "$target_os" in
|
||||
darwin*)
|
||||
# libxul is causing performance issues due to mach-o not hiding symbols
|
||||
# Disable it temporarily
|
||||
MOZ_ENABLE_LIBXUL=
|
||||
;;
|
||||
*)
|
||||
MOZ_ENABLE_LIBXUL=1
|
||||
;;
|
||||
esac
|
||||
|
||||
MOZ_ENABLE_LIBXUL=1
|
||||
MOZ_PLACES=1
|
||||
MOZ_PLACES_BOOKMARKS=1
|
||||
# always enabled for form history
|
||||
|
@ -2695,8 +2695,8 @@ EOF
|
||||
EOF
|
||||
ac_cv_visibility_pragma=no
|
||||
if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
|
||||
if egrep '\.(hidden|extern_private).*foo_hidden' conftest.s >/dev/null; then
|
||||
if ! egrep '\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then
|
||||
if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
|
||||
if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
|
||||
ac_cv_visibility_pragma=yes
|
||||
fi
|
||||
fi
|
||||
@ -2719,7 +2719,7 @@ EOF
|
||||
if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
|
||||
ac_cv_have_visibility_class_bug=yes
|
||||
else
|
||||
if test `grep -c "@PLT" conftest.S` = 0; then
|
||||
if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
|
||||
ac_cv_have_visibility_class_bug=yes
|
||||
fi
|
||||
fi
|
||||
|
@ -50,7 +50,7 @@ class nsWeakReference;
|
||||
// Set IMETHOD_VISIBILITY to empty so that the class-level NS_COM declaration
|
||||
// controls member method visibility.
|
||||
#undef IMETHOD_VISIBILITY
|
||||
#define IMETHOD_VISIBILITY
|
||||
#define IMETHOD_VISIBILITY NS_COM_GLUE
|
||||
|
||||
class NS_COM_GLUE nsSupportsWeakReference : public nsISupportsWeakReference
|
||||
{
|
||||
|
@ -145,8 +145,6 @@ REQUIRES += macmorefiles
|
||||
CPPSRCS += \
|
||||
nsAppleSingleDecoder.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/xpcom/MoreFiles/libmacmorefiles_s.a
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../public
|
||||
@ -160,7 +158,10 @@ EXTRA_DSO_LDOPTS = \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(DEPTH)/xpcom/MoreFiles/libmacmorefiles_s.a \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
Loading…
Reference in New Issue
Block a user