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 = [ |