third_party/yasm/BUILD.gn - Issue 913373002: Update Chomium's build files to work w/ latest GN binaries.

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 913373002: Update Chomium's build files to work w/ latest GN binaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_cpu_arch_changes

Patch Set: merge to #317214 Created 5 years, 10 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:

View side-by-side diff with in-line comments

Download patch

Index: third_party/yasm/BUILD.gn

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

index 3c5215e7d48bad28333bd6073779253da507bc82..a09a4959a620f35f0b9f67c0c4a7847351583f9a 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" ]

« third_party/widevine/cdm/BUILD.gn ('K') | « third_party/widevine/cdm/BUILD.gn ('k') | third_party/yasm/yasm_assemble.gni » ('j') | no next file with comments »