Fix for ARM cross build with clang.

src/trusted/service_runtime/linux/nacl_bootstrap.gyp

 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../../../build/common.gypi',
   ],
   'conditions': [
     ['target_arch=="x64"', {
@@ skipping 138 matching lines @@
             # set at gyp time. This is a hacky way to bake the correct
             # CXX into the build at gyp time.
             # TODO(sbc): Do this better by providing some gyp syntax
             # for accessing the name of the configured compiler, or
             # even a better way to access gyp time environment
             # variables from within a gyp file.
             ['OS=="android"', {
               'variables': {
                 'compiler': '<!(/bin/echo -n <(android_toolchain)/*-g++)',
               }
+            }],
+            # When building for ARM default to arm-linux-gnueabihf-g++ rather
+            # than g++.  This is needed when building with clang (since in
+            # this case $CC and $CXX are not set in the environment).
+            ['OS!="android" and target_arch=="arm"', {
+              'variables': {
+                'compiler': '<!(echo ${CXX:=arm-linux-gnueabihf-g++})',
+              }
             }, {
               'variables': {
                 'compiler': '<!(echo ${CXX:=g++})',
               }
             }],
           ],
           'action': ['python', 'ld_bfd.py',
                      '--compiler', '<(compiler)',
                      '-m', '<(linker_emulation)',
                      '--build-id',
@@ skipping 35 matching lines @@
         'action_name': 'munge_phdr',
         'inputs': ['nacl_bootstrap_munge_phdr.py',
                    '<(PRODUCT_DIR)/nacl_bootstrap_raw'],
         'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'],
         'message': 'Munging ELF program header',
         'action': ['python', '<@(_inputs)', '<@(_outputs)']
       }],
     },
   ],
 }