diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 17:53:58 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 17:53:58 +0000 |
| commit | 063676f690cd71759e8a94d620201934ea10b3b9 (patch) | |
| tree | f151abca9df75fa4e7262f98f1dcabd5fe8223d0 /build | |
| parent | b94aebed0daf219c51f8f292776c2e9fd38ec0a1 (diff) | |
| download | chromium_src-063676f690cd71759e8a94d620201934ea10b3b9.zip chromium_src-063676f690cd71759e8a94d620201934ea10b3b9.tar.gz chromium_src-063676f690cd71759e8a94d620201934ea10b3b9.tar.bz2 | |
linux: clean up include paths for local nss headers
The comment stated that gyp include paths come after cflags, but
that is not true: include paths come before cflags. Use the gyp
prepend operator just to be extra sure.
Review URL: http://codereview.chromium.org/7720016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index e87e1a7..2221c01 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -90,16 +90,12 @@ '../../third_party/zlib/zlib.gyp:zlib', ], 'direct_dependent_settings': { - 'cflags': [ + 'include_dirs+': [ # We need for our local copies of the libssl3 headers to come - # first, otherwise the code will build, but will fallback to - # the set of features advertised in the system headers. - # Unfortunately, there's no include path that we can filter - # out of $(pkg-config --cflags nss) and GYP include paths - # come after cflags on the command line. So we have these - # bodges: - '-Inet/third_party/nss/ssl', # for make - '-ISource/WebKit/chromium/net/third_party/nss/ssl', # for make in webkit + # before other includes, as we are shadowing system headers. + '<(DEPTH)/net/third_party/nss/ssl', + ], + 'cflags': [ '<!@(<(pkg-config) --cflags nss)', ], }, |