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

Unified Diff: src/trusted/service_runtime/linux/nacl_bootstrap.gyp

Issue 411803002: Fix for building ARM/linux using clang. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 6 years, 5 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: src/trusted/service_runtime/linux/nacl_bootstrap.gyp
diff --git a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
index 17ba84e843efd7c238c271ce10513f8da7d8bbd8..6ce2f8dbf44d020a0efcd1711f786f0763fb9173 100644
--- a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
+++ b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp
@@ -185,6 +185,11 @@
'variables': {
'compiler': '<!(/bin/echo -n <(android_toolchain)/*-g++)',
}
+ }],
+ ['OS!="android" and target_arch=="arm"', {
+ 'variables': {
+ 'compiler': '<!(echo ${CXX:=arm-linux-gnueabi-g++})',
Mark Seaborn 2014/07/23 19:13:41 I don't understand this part of the change. Can y
Sam Clegg 2014/07/23 19:21:52 This action needs access to the target linker. I'
+ }
}, {
'variables': {
'compiler': '<!(echo ${CXX:=g++})',

Powered by Google App Engine
This is Rietveld 408576698