 Chromium Code Reviews
 Chromium Code Reviews Issue 411803002:
  Fix for building ARM/linux using clang.  (Closed) 
  Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
    
  
    Issue 411803002:
  Fix for building ARM/linux using clang.  (Closed) 
  Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client| OLD | NEW | 
|---|---|
| 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6 'includes': [ | 6 'includes': [ | 
| 7 '../../../../build/common.gypi', | 7 '../../../../build/common.gypi', | 
| 8 ], | 8 ], | 
| 9 'conditions': [ | 9 'conditions': [ | 
| 10 ['target_arch=="x64"', { | 10 ['target_arch=="x64"', { | 
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 # set at gyp time. This is a hacky way to bake the correct | 149 # set at gyp time. This is a hacky way to bake the correct | 
| 150 # CXX into the build at gyp time. | 150 # CXX into the build at gyp time. | 
| 151 # TODO(sbc): Do this better by providing some gyp syntax | 151 # TODO(sbc): Do this better by providing some gyp syntax | 
| 152 # for accessing the name of the configured compiler, or | 152 # for accessing the name of the configured compiler, or | 
| 153 # even a better way to access gyp time environment | 153 # even a better way to access gyp time environment | 
| 154 # variables from within a gyp file. | 154 # variables from within a gyp file. | 
| 155 ['OS=="android"', { | 155 ['OS=="android"', { | 
| 156 'variables': { | 156 'variables': { | 
| 157 'compiler': '<!(/bin/echo -n <(android_toolchain)/*-g++)', | 157 'compiler': '<!(/bin/echo -n <(android_toolchain)/*-g++)', | 
| 158 } | 158 } | 
| 159 }], | |
| 160 # When building for ARM default to arm-linux-gnueabi-g++ rather | |
| 161 # than g++. This is needed when building with clang (since in | |
| 162 # this case $CC and $CXX are not set in the envrionement). | |
| 
Mark Seaborn
2014/07/28 19:23:20
"environment"
 | |
| 163 ['OS!="android" and target_arch=="arm"', { | |
| 164 'variables': { | |
| 165 '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
 | |
| 166 } | |
| 159 }, { | 167 }, { | 
| 160 'variables': { | 168 'variables': { | 
| 161 'compiler': '<!(echo ${CXX:=g++})', | 169 'compiler': '<!(echo ${CXX:=g++})', | 
| 162 } | 170 } | 
| 163 }], | 171 }], | 
| 164 ], | 172 ], | 
| 165 'action': ['python', 'ld_bfd.py', | 173 'action': ['python', 'ld_bfd.py', | 
| 166 '--compiler', '<(compiler)', | 174 '--compiler', '<(compiler)', | 
| 167 '-m', '<(linker_emulation)', | 175 '-m', '<(linker_emulation)', | 
| 168 '--build-id', | 176 '--build-id', | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 204 'action_name': 'munge_phdr', | 212 'action_name': 'munge_phdr', | 
| 205 'inputs': ['nacl_bootstrap_munge_phdr.py', | 213 'inputs': ['nacl_bootstrap_munge_phdr.py', | 
| 206 '<(PRODUCT_DIR)/nacl_bootstrap_raw'], | 214 '<(PRODUCT_DIR)/nacl_bootstrap_raw'], | 
| 207 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], | 215 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], | 
| 208 'message': 'Munging ELF program header', | 216 'message': 'Munging ELF program header', | 
| 209 'action': ['python', '<@(_inputs)', '<@(_outputs)'] | 217 'action': ['python', '<@(_inputs)', '<@(_outputs)'] | 
| 210 }], | 218 }], | 
| 211 }, | 219 }, | 
| 212 ], | 220 ], | 
| 213 } | 221 } | 
| OLD | NEW |