summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 20:37:36 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 20:37:36 +0000
commit371e1091ebd6af7f6e110a84fd105f6c81a1fb88 (patch)
treeaf3156c793e9352b978233c6757b2393a5de94f9 /build/common.gypi
parenta6ffd7d8c87672af4970e52d29d0b15479f11cad (diff)
downloadchromium_src-371e1091ebd6af7f6e110a84fd105f6c81a1fb88.zip
chromium_src-371e1091ebd6af7f6e110a84fd105f6c81a1fb88.tar.gz
chromium_src-371e1091ebd6af7f6e110a84fd105f6c81a1fb88.tar.bz2
Fix build with system yasm.
BUG=100078 Review URL: http://codereview.chromium.org/8243012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 9239aac..6c1d948 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -383,6 +383,9 @@
# Whether to build for Wayland display server
'use_wayland%': 0,
+ # Use system yasm instead of bundled one.
+ 'use_system_yasm%': 0,
+
# Default to enabled PIE; this is important for ASLR but we need to be
# able to turn it off for remote debugging on Chromium OS
'linux_disable_pie%': 0,