diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 05:50:08 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 05:51:55 +0000 |
| commit | 25a24e96549586a99aec858da91db608fd28bf1d (patch) | |
| tree | 6d3189031c0d996267201b54870f58f92b5bdabb /third_party | |
| parent | dba26a7c39247f4744151434fc985e3d73885326 (diff) | |
| download | chromium_src-25a24e96549586a99aec858da91db608fd28bf1d.zip chromium_src-25a24e96549586a99aec858da91db608fd28bf1d.tar.gz chromium_src-25a24e96549586a99aec858da91db608fd28bf1d.tar.bz2 | |
gn yasm: use root_build_dir instead of . for rebase_path
I think these should be relative to the root_build_dir not the BUILD.gn
dir (which is what "." is right?). It was working before if you
happen to use (say) out\Default as the GN directory, but I've been using
out_gn so there was an extra .. in the path.
Also, a missing size_t->int warning disable on Windows.
R=brettw@chromium.org
BUG=354261
Review URL: https://codereview.chromium.org/477483002
Cr-Commit-Position: refs/heads/master@{#289813}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/yasm/BUILD.gn | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index 3463852..812be9a 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -121,6 +121,8 @@ if (current_toolchain == host_toolchain) { # re2c is missing CLOSEVOP from one switch. if (is_posix) { cflags = [ "-Wno-switch" ] + } else if (is_win) { + cflags = [ "/wd4267" ] # size_t to int conversion. } } @@ -254,7 +256,7 @@ if (current_toolchain == host_toolchain) { outputs = [ "$target_gen_dir/{{source_name_part}}.c" ] args = [ "{{source}}", - rebase_path(target_gen_dir, ".") + "/{{source_name_part}}.c", + rebase_path(target_gen_dir, root_build_dir) + "/{{source_name_part}}.c", ] deps = [ ":generate_x86_insn" @@ -278,7 +280,8 @@ if (current_toolchain == host_toolchain) { outputs = [ "$yasm_gen_include_dir/{{source_name_part}}.c" ] args = [ "{{source}}", - rebase_path(yasm_gen_include_dir, ".") + "/{{source_name_part}}.c", + rebase_path(yasm_gen_include_dir, root_build_dir) + + "/{{source_name_part}}.c", ] deps = [ ":generate_x86_insn" @@ -343,7 +346,7 @@ if (current_toolchain == host_toolchain) { args = [ "-b", "-o", - rebase_path(target_gen_dir, ".") + "/{{source_name_part}}.c", + rebase_path(target_gen_dir, root_build_dir) + "/{{source_name_part}}.c", "{{source}}", ] } |