summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 19:00:31 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 19:00:31 +0000
commitd8c7cbccd6557ed455d9d4a212a2824972072505 (patch)
treeff9261a8931be3775c6c3786c4527a30cf6b5676 /build
parent21e8556f0651a4e132fde29bc4738229eaa3305b (diff)
downloadchromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.zip
chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.gz
chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.bz2
Add an option to disable NaCl at compile time for platforms where it doesn't build yet
Just add disable_nacl=1 to gyp defines Review URL: http://codereview.chromium.org/257029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi11
1 files changed, 11 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 37526e2..d1dfc65 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -154,6 +154,10 @@
# Set to select the Title Case versions of strings in GRD files.
'use_titlecase_in_grd_files%': 0,
+ # Used to disable Native Client at compile time, for platforms where it
+ # isn't supported
+ 'disable_nacl%': 0,
+
'conditions': [
['OS=="linux"', {
'conditions': [
@@ -847,6 +851,13 @@
],
},
}],
+ ['disable_nacl==1', {
+ 'target_defaults': {
+ 'defines': [
+ 'DISABLE_NACL',
+ ],
+ },
+ }],
['msvs_use_common_linker_extras', {
'target_defaults': {
'msvs_settings': {