diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:54:37 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:54:37 +0000 |
| commit | efe4c0c65ad3bd9c5910985acc5d4ab2b73641f3 (patch) | |
| tree | 1192cb99f9b454431a7a184708a5beeb0ac7d8a7 /build/linux | |
| parent | 9cf4545bf0f6499f2ad86831d72a81658d0f397d (diff) | |
| download | chromium_src-efe4c0c65ad3bd9c5910985acc5d4ab2b73641f3.zip chromium_src-efe4c0c65ad3bd9c5910985acc5d4ab2b73641f3.tar.gz chromium_src-efe4c0c65ad3bd9c5910985acc5d4ab2b73641f3.tar.bz2 | |
Linux: fix scons build so that libssl gets the right headers.
http://codereview.chromium.org/515021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index c51d0a7..62bbcbb 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -81,7 +81,15 @@ ], 'direct_dependent_settings': { 'cflags': [ - '-Inet/third_party/nss/ssl', + # We need for our local copies of the libssl 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: + '-I../net/third_party/nss/ssl', # for scons + '-Inet/third_party/nss/ssl', # for make '<!@(<(pkg-config) --cflags nss)', ], }, |