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 c0bdc266beb92aa05ae699904e15adcf45766373..ba4e1957cddac9edf6cd95408e54a4fca9c985fa 100644 |
--- a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp |
+++ b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp |
@@ -156,6 +156,14 @@ |
'variables': { |
'compiler': '<!(/bin/echo -n <(android_toolchain)/*-g++)', |
} |
+ }], |
+ # When building for ARM default to arm-linux-gnueabi-g++ rather |
+ # than g++. This is needed when building with clang (since in |
+ # this case $CC and $CXX are not set in the envrionement). |
Mark Seaborn
2014/07/28 19:23:20
"environment"
|
+ ['OS!="android" and target_arch=="arm"', { |
+ 'variables': { |
+ 'compiler': '<!(echo ${CXX:=arm-linux-gnueabi-g++})', |
Roland McGrath
2014/07/28 19:20:51
I don't really understand what's going on here, bu
Mark Seaborn
2014/07/28 19:23:20
It's a bit counterintuitive that in order to build
|
+ } |
}, { |
'variables': { |
'compiler': '<!(echo ${CXX:=g++})', |