Bug 1722653 - Remove MOZ_CAIRO_*LIBS. r=firefox-build-system-reviewers,andi

MOZ_CAIRO_LIBS is unused and MOZ_CAIRO_OSLIBS is largely redundant with
other variables.

Differential Revision: https://phabricator.services.mozilla.com/D121067
This commit is contained in:
Mike Hommey 2021-07-29 23:38:32 +00:00
parent 03223f9ea4
commit 61fa414e0a
2 changed files with 1 additions and 7 deletions

View File

@ -2334,12 +2334,6 @@ esac
AC_SUBST(MOZ_ENABLE_CAIRO_FT)
AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
if test "$MOZ_X11"; then
MOZ_CAIRO_OSLIBS="$MOZ_CAIRO_OSLIBS $XLDFLAGS -lXrender"
fi
AC_SUBST_LIST(MOZ_CAIRO_LIBS)
AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
AC_SUBST(MOZ_TREE_PIXMAN)
dnl ========================================================

View File

@ -242,7 +242,6 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
"-lgvr",
]
OS_LIBS += CONFIG["MOZ_CAIRO_OSLIBS"]
OS_LIBS += CONFIG["MOZ_WEBRTC_X11_LIBS"]
if CONFIG["MOZ_SYSTEM_JPEG"]:
@ -287,6 +286,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
OS_LIBS += CONFIG["MOZ_PANGO_LIBS"]
OS_LIBS += CONFIG["XT_LIBS"]
OS_LIBS += [
"Xrender",
"gthread-2.0",
]