summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbadea@adobe.com <badea@adobe.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 15:27:16 +0000
committerbadea@adobe.com <badea@adobe.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 15:27:16 +0000
commitd24206a4e231408592a176cf4a5fe018bf264f64 (patch)
tree9dc413f203b78201da5c1888247ad2945c4091a0
parentb9692bfff4e5cbb8e8ac9d62b95d68a84623ed19 (diff)
downloadchromium_src-d24206a4e231408592a176cf4a5fe018bf264f64.zip
chromium_src-d24206a4e231408592a176cf4a5fe018bf264f64.tar.gz
chromium_src-d24206a4e231408592a176cf4a5fe018bf264f64.tar.bz2
Add yasm flags for 64-bit mac builds.
BUG=150760, 150980 Review URL: https://chromiumcodereview.appspot.com/10952023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157771 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/yasm/yasm_compile.gypi6
1 files changed, 6 insertions, 0 deletions
diff --git a/third_party/yasm/yasm_compile.gypi b/third_party/yasm/yasm_compile.gypi
index 52760cc..da3ef80 100644
--- a/third_party/yasm/yasm_compile.gypi
+++ b/third_party/yasm/yasm_compile.gypi
@@ -55,6 +55,12 @@
'-m', 'x86',
],
}],
+ [ 'OS=="mac" and target_arch=="x64"', {
+ 'yasm_flags': [
+ '-fmacho64',
+ '-m', 'amd64',
+ ],
+ }],
[ 'OS=="win" and target_arch=="ia32"', {
'yasm_flags': [
'-DPREFIX',