Index: third_party/yasm/yasm.gyp |
diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp |
index 69b63cae5bd5e0ada821884ab582dc7824c62745..cfd67ecbf5575a21a6413c6232553932c945ce24 100644 |
--- a/third_party/yasm/yasm.gyp |
+++ b/third_party/yasm/yasm.gyp |
@@ -32,7 +32,7 @@ |
{ |
'variables': { |
'yasm_include_dirs': [ |
- 'source/config/linux', |
+ 'source/config/<(OS)', |
'source/patched-yasm', |
], |
@@ -41,8 +41,8 @@ |
# it would probably be safe to use these flags there as well, the |
# ./configure based build does not use the same flags between the main |
# yasm executable, and its subprograms. |
- 'yasm_c_flags': [ |
- '-DHAVE_CONFIG_H', |
+ 'yasm_defines': ['HAVE_CONFIG_H'], |
+ 'yasm_cflags': [ |
'-std=gnu99', |
'-ansi', |
'-pedantic', |
@@ -61,6 +61,7 @@ |
'target_name': 'yasm', |
'type': 'executable', |
'dependencies': [ |
+ 'config_sources', |
'genmacro', |
'genmodule', |
'genperf', |
@@ -153,9 +154,8 @@ |
'<(shared_generated_dir)', |
'<(generated_dir)', |
], |
- 'cflags': [ |
- '<@(yasm_c_flags)', |
- ], |
+ 'defines': [ '<@(yasm_defines)' ], |
+ 'cflags': [ '<@(yasm_cflags)', ], |
'rules': [ |
{ |
'rule_name': 'generate_gperf', |
@@ -313,7 +313,7 @@ |
{ |
'action_name': 'generate_module', |
'variables': { |
- 'makefile': 'source/config/linux/Makefile', |
+ 'makefile': 'source/config/<(OS)/Makefile', |
'module_in': 'source/patched-yasm/libyasm/module.in', |
'outfile': '<(generated_dir)/module.c', |
}, |
@@ -416,8 +416,9 @@ |
'include_dirs': [ |
'<@(yasm_include_dirs)', |
], |
+ 'defines': [ '<@(yasm_defines)' ], |
'cflags': [ |
- '<(yasm_c_flags)', |
+ '<@(yasm_cflags)', |
], |
}, |
{ |