diff options
| author | dpranke <dpranke@chromium.org> | 2015-09-10 17:45:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-11 00:46:48 +0000 |
| commit | a512a524d8541b52c0a0a264215d3499ec1bbb1d (patch) | |
| tree | 8d7f4883f033b18a4b284a74b0bb6db4e78e35fd /build/toolchain/nacl | |
| parent | b9db46ab9f59f66e6ad0ad190ea416dff06df6cd (diff) | |
| download | chromium_src-a512a524d8541b52c0a0a264215d3499ec1bbb1d.zip chromium_src-a512a524d8541b52c0a0a264215d3499ec1bbb1d.tar.gz chromium_src-a512a524d8541b52c0a0a264215d3499ec1bbb1d.tar.bz2 | |
Enable nacl on 32-bit x86 linux GN builds.
It looks like the only thing missing at this point was to correct
the path to the host build of tls_edit when linking the IRT.
R=brettw@chromium.org, phosek@chromium.org
BUG=512882
Review URL: https://codereview.chromium.org/1338483002
Cr-Commit-Position: refs/heads/master@{#348302}
Diffstat (limited to 'build/toolchain/nacl')
| -rw-r--r-- | build/toolchain/nacl/BUILD.gn | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build/toolchain/nacl/BUILD.gn b/build/toolchain/nacl/BUILD.gn index 8cf6c1b..5bda552 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, ] } |