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++})', |