diff options
| author | mukai <mukai@chromium.org> | 2014-10-03 18:15:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-04 01:16:03 +0000 |
| commit | a59ce187e29beb8883ed211028f72557c7e4541b (patch) | |
| tree | c5d93335ed4cede1819076bca5bffa934a0d91db /third_party | |
| parent | 4e4e50ece1a37bf8be862523474b5c743b222861 (diff) | |
| download | chromium_src-a59ce187e29beb8883ed211028f72557c7e4541b.zip chromium_src-a59ce187e29beb8883ed211028f72557c7e4541b.tar.gz chromium_src-a59ce187e29beb8883ed211028f72557c7e4541b.tar.bz2 | |
Fix the GN rule of yasm for ChromeOS.
ChromeOS needs to run as linux here.
BUG=None
R=cmasone@chromium.org, hclam@chromium.org
TEST=manually
Review URL: https://codereview.chromium.org/627873002
Cr-Commit-Position: refs/heads/master@{#298149}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/yasm/BUILD.gn | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index 9429bc0..700e745 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -31,14 +31,18 @@ if (current_toolchain == host_toolchain) { # Various files referenced by multiple targets. yasm_gen_include_dir = "$target_gen_dir/include" - config_makefile = "source/config/$os/Makefile" + yasm_os = os + if (is_chromeos) { + yasm_os = "linux" + } + config_makefile = "source/config/$yasm_os/Makefile" version_file = "version.mac" import("//build/compiled_action.gni") config("yasm_config") { include_dirs = [ - "source/config/$os", + "source/config/$yasm_os", "source/patched-yasm", ] defines = [ "HAVE_CONFIG_H" ] |