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

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

Issue 893993005: NaCl-side GN changes to enable NaCl in Linux x64 Chrome builds. (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@nacl_trusted_3
Patch Set: update w/ review feedback 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
« no previous file with comments | « no previous file | src/shared/serialization/BUILD.gn » ('j') | src/shared/serialization/BUILD.gn » ('J')
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 10a0651deb90f8d9231fb81ac9b82c09d12195ff..9e96f522afa0c5e5c6ab06ded72b3b87ea0e3503 100644
--- a/build/toolchain/nacl/BUILD.gn
+++ b/build/toolchain/nacl/BUILD.gn
@@ -126,8 +126,9 @@ nacl_toolchain("irt_x86") {
cxx = toolprefix + "clang++"
ar = toolprefix + "ar"
readelf = toolprefix + "readelf"
- # Link with cc to avoid including any C++ libs.
- ld = "${python_path} ${link_irt} --tls-edit=tls_edit --link-cmd=${cc} --readelf-cmd=${readelf}"
+ # Some IRT implementations (notably, Chromium's) contain C++ code,
Nick Bray (chromium) 2015/02/05 22:52:55 Roland: are we cool with irt_core also being linke
Roland McGrath 2015/02/05 22:58:02 It's probably fine, but I'd like to see the compar
+ # so we need to link w/ the C++ linker.
+ ld = "${python_path} ${link_irt} --tls-edit=tls_edit --link-cmd=${cxx} --readelf-cmd=${readelf}"
# TODO(ncbray): depend on link script
deps = [
@@ -147,7 +148,7 @@ nacl_toolchain("irt_x64") {
ar = toolprefix + "ar"
readelf = toolprefix + "readelf"
# Link with cc to avoid including any C++ libs.
Nick Bray (chromium) 2015/02/05 22:52:55 Same comment, same change.
Dirk Pranke 2015/02/05 22:55:47 Ah, I missed the duplication. Will fix.
- ld = "${python_path} ${link_irt} --tls-edit=tls_edit --link-cmd=${cc} --readelf-cmd=${readelf}"
+ ld = "${python_path} ${link_irt} --tls-edit=tls_edit --link-cmd=${cxx} --readelf-cmd=${readelf}"
# TODO(ncbray): depend on link script
deps = [
« no previous file with comments | « no previous file | src/shared/serialization/BUILD.gn » ('j') | src/shared/serialization/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698