third_party/yasm/BUILD.gn - Issue 627873002: Fix the GN rule of yasm for ChromeOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/yasm/BUILD.gn

Issue 627873002: Fix the GN rule of yasm for ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/yasm/BUILD.gn

diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn

index 9429bc0cfde839b65e35e59bcab5c4868a8806a9..700e7452bf8dbb625be752951cb9d1c92f5b665e 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" ]

« no previous file with comments | « no previous file | no next file » | no next file with comments »