Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3973)

Unified Diff: build/toolchain/nacl/BUILD.gn

Issue 1338483002: Enable nacl on 32-bit x86 linux GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nacl_x86
Patch Set: Created 5 years, 3 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
« no previous file with comments | « build/config/features.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/nacl/BUILD.gn
diff --git a/build/toolchain/nacl/BUILD.gn b/build/toolchain/nacl/BUILD.gn
index 8cf6c1bdc9097dcd87d3195b6f21c11d94289be4..5bda55280fff87351c51ae922dc50a88babe5bea 100644
--- a/build/toolchain/nacl/BUILD.gn
+++ b/build/toolchain/nacl/BUILD.gn
@@ -153,13 +153,19 @@ nacl_toolchain("irt_x86") {
ar = toolprefix + "ar"
readelf = toolprefix + "readelf"
+ tls_edit_label =
+ "//native_client/src/tools/tls_edit:tls_edit($host_toolchain)"
+ host_toolchain_out_dir =
+ rebase_path(get_label_info(tls_edit_label, "root_out_dir"),
+ root_build_dir)
+
# Some IRT implementations (notably, Chromium's) contain C++ code,
# so we need to link w/ the C++ linker.
- ld = "${python_path} ${link_irt} --tls-edit=tls_edit --link-cmd=${cxx} --readelf-cmd=${readelf}"
+ ld = "${python_path} ${link_irt} --tls-edit=${host_toolchain_out_dir}/tls_edit --link-cmd=${cxx} --readelf-cmd=${readelf}"
# TODO(ncbray): depend on link script
deps = [
- "//native_client/src/tools/tls_edit:tls_edit($host_toolchain)",
+ tls_edit_label,
]
}
« no previous file with comments | « build/config/features.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698