--- mozilla/gfx/skia/Makefile.in~
+++ mozilla/gfx/skia/Makefile.in
@@ -339,10 +339,9 @@ CPPSRCS += \
 	SkMMapStream.cpp \
 	SkOSFile.cpp \
 	$(NULL)
-ifeq (Linux,$(OS_TARGET))
+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
 CPPSRCS += \
 	SkFontHost_linux.cpp \
-	SkFontHost_tables.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 endif