summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 05:02:41 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 05:02:41 +0000
commit913cedfc4c6b3024e983528f7078fba7de61cb1a (patch)
tree3e065935a961bbc9cf791d5dbefb236c73c0b0e6 /build
parentd643f414a8d6942e7c79c2e71f6c717da5fe3106 (diff)
downloadchromium_src-913cedfc4c6b3024e983528f7078fba7de61cb1a.zip
chromium_src-913cedfc4c6b3024e983528f7078fba7de61cb1a.tar.gz
chromium_src-913cedfc4c6b3024e983528f7078fba7de61cb1a.tar.bz2
Add another path for NSS when building in a webkit checkout with
the Makefile moved to the top of the webkit checkout. Review URL: http://codereview.chromium.org/2771003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/linux/system.gyp5
1 files changed, 3 insertions, 2 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index dbd394b..71e4afa 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -88,8 +88,9 @@
# 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
+ '-I../net/third_party/nss/ssl', # for scons
+ '-Inet/third_party/nss/ssl', # for make
+ '-IWebKit/chromium/net/third_party/nss/ssl', # for make in webkit
'<!@(<(pkg-config) --cflags nss)',
],
},