Attachment #453338 for bug #582432

View | Details | Raw Unified | Return to bug 582432
Collapse All | Expand All




# we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the
# linker will drop those dependencies because no symbols are used from them.
# But those dependencies need to be kept for things to work properly.
# Ideally, we'd only add -Wl,--no-as-needed if necessary, but it's just simpler
# to add it unconditionally. This library is also simple enough that forcing
# -Wl,--as-needed after the gtk libraries is not going to make a significant
# difference.
if CONFIG['GCC_USE_GNU_LD']:
    no_as_needed = []
    as_needed = []
else:
    no_as_needed = []
    as_needed = []

OS_LIBS += [f for f in CONFIG['MOZ_GTK2_LIBS'] if f.startswith('-L')]
OS_LIBS += no_as_needed
OS_LIBS += [
    'gtk-x11-2.0',




# we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the
# linker will drop those dependencies because no symbols are used from them.
# But those dependencies need to be kept for things to work properly.
# Ideally, we'd only add -Wl,--no-as-needed if necessary, but it's just simpler
# to add it unconditionally. This library is also simple enough that forcing
# -Wl,--as-needed after the gtk libraries is not going to make a significant
# difference.
if CONFIG['GCC_USE_GNU_LD']:
    no_as_needed = []
    as_needed = []
else:
    no_as_needed = []
    as_needed = []

OS_LIBS += [f for f in CONFIG['MOZ_GTK3_LIBS'] if f.startswith('-L')]
OS_LIBS += no_as_needed
OS_LIBS += [
    'gtk-3',

Return to bug 582432

Lines 20-37 Link Here

(-)a/widget/gtk/mozgtk/gtk2/moz.build (-2 / +2 lines)
20	# we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the	20	# we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the
21	# linker will drop those dependencies because no symbols are used from them.	21	# linker will drop those dependencies because no symbols are used from them.
22	# But those dependencies need to be kept for things to work properly.	22	# But those dependencies need to be kept for things to work properly.
23	# Ideally, we'd only add -Wl,--no-as-needed if necessary, but it's just simpler	23	# Ideally, we'd only add -Wl,--no-as-needed if necessary, but it's just simpler
24	# to add it unconditionally. This library is also simple enough that forcing	24	# to add it unconditionally. This library is also simple enough that forcing
25	# -Wl,--as-needed after the gtk libraries is not going to make a significant	25	# -Wl,--as-needed after the gtk libraries is not going to make a significant
26	# difference.	26	# difference.
27	if CONFIG['GCC_USE_GNU_LD']:	27	if CONFIG['GCC_USE_GNU_LD']:
28	no_as_needed = ['-Wl,--no-as-needed']	28	no_as_needed = []
29	as_needed = ['-Wl,--as-needed']	29	as_needed = []
30	else:	30	else:
31	no_as_needed = []	31	no_as_needed = []
32	as_needed = []	32	as_needed = []
33		33
34	OS_LIBS += [f for f in CONFIG['MOZ_GTK2_LIBS'] if f.startswith('-L')]	34	OS_LIBS += [f for f in CONFIG['MOZ_GTK2_LIBS'] if f.startswith('-L')]
35	OS_LIBS += no_as_needed	35	OS_LIBS += no_as_needed
36	OS_LIBS += [	36	OS_LIBS += [
37	'gtk-x11-2.0',	37	'gtk-x11-2.0',

Lines 18-35 Link Here

(-)a/widget/gtk/mozgtk/gtk3/moz.build (-2 / +2 lines)
18	# we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the	18	# we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the
19	# linker will drop those dependencies because no symbols are used from them.	19	# linker will drop those dependencies because no symbols are used from them.
20	# But those dependencies need to be kept for things to work properly.	20	# But those dependencies need to be kept for things to work properly.
21	# Ideally, we'd only add -Wl,--no-as-needed if necessary, but it's just simpler	21	# Ideally, we'd only add -Wl,--no-as-needed if necessary, but it's just simpler
22	# to add it unconditionally. This library is also simple enough that forcing	22	# to add it unconditionally. This library is also simple enough that forcing
23	# -Wl,--as-needed after the gtk libraries is not going to make a significant	23	# -Wl,--as-needed after the gtk libraries is not going to make a significant
24	# difference.	24	# difference.
25	if CONFIG['GCC_USE_GNU_LD']:	25	if CONFIG['GCC_USE_GNU_LD']:
26	no_as_needed = ['-Wl,--no-as-needed']	26	no_as_needed = []
27	as_needed = ['-Wl,--as-needed']	27	as_needed = []
28	else:	28	else:
29	no_as_needed = []	29	no_as_needed = []
30	as_needed = []	30	as_needed = []
31		31
32	OS_LIBS += [f for f in CONFIG['MOZ_GTK3_LIBS'] if f.startswith('-L')]	32	OS_LIBS += [f for f in CONFIG['MOZ_GTK3_LIBS'] if f.startswith('-L')]
33	OS_LIBS += no_as_needed	33	OS_LIBS += no_as_needed
34	OS_LIBS += [	34	OS_LIBS += [
35	'gtk-3',	35	'gtk-3',