diff options
| author | dpranke <dpranke@chromium.org> | 2015-02-19 18:55:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 02:56:07 +0000 |
| commit | 4327621a322c964a8bc6d1ef5a4534f0f877d63e (patch) | |
| tree | eb4397f38579a5d7dcb821a8873e4006187dd450 /third_party/yasm | |
| parent | 05b60060481868d9d6892f05e25e33e7934d1284 (diff) | |
| download | chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.zip chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.gz chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.bz2 | |
Update Chomium's build files to work w/ latest GN binaries.
The latest GN binaries rename cpu_arch to current_cpu and/or target_cpu
as appropriate, build_cpu_arch to host_cpu, and os to current_os and target_os as appropriate.
R=brettw@chromium.org
TBR=ddorwin@chromium.org
EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
BUG=344767
Review URL: https://codereview.chromium.org/913373002
Cr-Commit-Position: refs/heads/master@{#317223}
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/BUILD.gn | 8 | ||||
| -rw-r--r-- | third_party/yasm/yasm_assemble.gni | 14 |
2 files changed, 9 insertions, 13 deletions
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index 3c5215e..a09a495 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -30,18 +30,14 @@ if (current_toolchain == host_toolchain) { # Various files referenced by multiple targets. yasm_gen_include_dir = "$target_gen_dir/include" - yasm_os = os - if (is_chromeos) { - yasm_os = "linux" - } - config_makefile = "source/config/$yasm_os/Makefile" + config_makefile = "source/config/$host_os/Makefile" version_file = "version.mac" import("//build/compiled_action.gni") config("yasm_config") { include_dirs = [ - "source/config/$yasm_os", + "source/config/$host_os", "source/patched-yasm", ] defines = [ "HAVE_CONFIG_H" ] diff --git a/third_party/yasm/yasm_assemble.gni b/third_party/yasm/yasm_assemble.gni index 56d7e11a..1a84d51 100644 --- a/third_party/yasm/yasm_assemble.gni +++ b/third_party/yasm/yasm_assemble.gni @@ -42,13 +42,13 @@ # } if (is_mac || is_ios) { - if (cpu_arch == "x86") { + if (current_cpu == "x86") { _yasm_flags = [ "-fmacho32", "-m", "x86", ] - } else if (cpu_arch == "x64") { + } else if (current_cpu == "x64") { _yasm_flags = [ "-fmacho64", "-m", @@ -56,13 +56,13 @@ if (is_mac || is_ios) { ] } } else if (is_posix) { - if (cpu_arch == "x86") { + if (current_cpu == "x86") { _yasm_flags = [ "-felf32", "-m", "x86", ] - } else if (cpu_arch == "x64") { + } else if (current_cpu == "x64") { _yasm_flags = [ "-DPIC", "-felf64", @@ -71,14 +71,14 @@ if (is_mac || is_ios) { ] } } else if (is_win) { - if (cpu_arch == "x86") { + if (current_cpu == "x86") { _yasm_flags = [ "-DPREFIX", "-fwin32", "-m", "x86", ] - } else if (cpu_arch == "x64") { + } else if (current_cpu == "x64") { _yasm_flags = [ "-fwin64", "-m", @@ -99,7 +99,7 @@ template("yasm_assemble") { # Only depend on YASM on x86 systems. Force compilation of .asm files for # ARM to fail. - assert(cpu_arch == "x86" || cpu_arch == "x64") + assert(current_cpu == "x86" || current_cpu == "x64") action_name = "${target_name}_action" source_set_name = target_name |