Skip to content

Commit

Permalink
Bug 1635273 - Make FT_LCD_FILTER_H a relative rather than absolute pa…
Browse files Browse the repository at this point in the history
…th. r=froydnj

This helps get sccache hits across source directories.

The previous presentation guaranteed the version of `ftlcdfil.h` in
the tree, while this unorthodox presentation only ensures that the
`freetype2` directory has parent `modules`.  This is at least unlikely
to occur in random `/usr/include` directories.

If this turns out to be an issue it would be possible to copy
`ftlcdfil.h` into the object directory, potentially with a unique
name, and then reference that (with a relative path).

Differential Revision: https://phabricator.services.mozilla.com/D73759
  • Loading branch information
ncalexan committed Jun 18, 2020
1 parent 986bc37 commit 2a0de54
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gfx/cairo/cairo/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ DEFINES['HAVE_UINT64_T'] = True

if CONFIG['MOZ_TREE_FREETYPE']:
DEFINES['HAVE_FT_LIBRARY_SETLCDFILTER'] = True
DEFINES['FT_LCD_FILTER_H'] = '%s/modules/freetype2/include/freetype/ftlcdfil.h' % TOPSRCDIR
DEFINES['FT_LCD_FILTER_H'] = '../../../modules/freetype2/include/freetype/ftlcdfil.h'

# Suppress warnings in third-party code.
CFLAGS += [
Expand Down

0 comments on commit 2a0de54

Please sign in to comment.