From 25a24e96549586a99aec858da91db608fd28bf1d Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Fri, 15 Aug 2014 05:50:08 +0000 Subject: 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 --- third_party/yasm/BUILD.gn | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'third_party') 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}}", ] } -- cgit v1.1