summaryrefslogtreecommitdiffstats
path: root/third_party/yasm
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/yasm')
-rw-r--r--third_party/yasm/yasm_compile.gypi7
1 files changed, 4 insertions, 3 deletions
diff --git a/third_party/yasm/yasm_compile.gypi b/third_party/yasm/yasm_compile.gypi
index 85948de..f9175e7 100644
--- a/third_party/yasm/yasm_compile.gypi
+++ b/third_party/yasm/yasm_compile.gypi
@@ -26,7 +26,9 @@
{
'variables': {
+ 'yasm_flags': [],
'yasm_path': '<(PRODUCT_DIR)/yasm',
+
'conditions': [
# Define yasm_flags that pass into YASM.
[ 'OS=="linux" and target_arch=="ia32"', {
@@ -57,11 +59,10 @@
}],
# Define output extension.
- ['OS=="mac" or OS=="linux"', {
- 'asm_obj_extension': 'o',
- }],
['OS=="win"', {
'asm_obj_extension': 'obj',
+ }, {
+ 'asm_obj_extension': 'o',
}],
],
}, # variables