summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-08 16:49:07 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-08 16:49:07 +0000
commitc486e4ee5565db7ff554f992f92757f456e1ec13 (patch)
tree822469cf46abc3634525379aac3bf7a6ec9faee4 /base/base.gyp
parent49da07b4e0625ba3228309148a607b587e58f3c8 (diff)
downloadchromium_src-c486e4ee5565db7ff554f992f92757f456e1ec13.zip
chromium_src-c486e4ee5565db7ff554f992f92757f456e1ec13.tar.gz
chromium_src-c486e4ee5565db7ff554f992f92757f456e1ec13.tar.bz2
Linux: add option to use system nspr.
Note that for NaCl bundles nspr files will be used anyway, since NaCl toolchain doesn't looks for libraries in system directories. BUG=none Review URL: https://codereview.chromium.org/11685002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp10
1 files changed, 10 insertions, 0 deletions
diff --git a/base/base.gyp b/base/base.gyp
index a584ae4..8c354e0 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -206,6 +206,11 @@
}],
],
}],
+ ['use_system_nspr==1', {
+ 'dependencies': [
+ 'third_party/nspr/nspr.gyp:nspr',
+ ],
+ }],
],
'sources': [
'third_party/nspr/prcpucfg.h',
@@ -716,6 +721,11 @@
'win/win_util_unittest.cc',
],
}],
+ ['use_system_nspr==1', {
+ 'dependencies': [
+ 'third_party/nspr/nspr.gyp:nspr',
+ ],
+ }],
], # conditions
'target_conditions': [
['OS == "ios"', {