Chromium Code Reviews| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 # set at gyp time. This is a hacky way to bake the correct | 178 # set at gyp time. This is a hacky way to bake the correct |
| 179 # CXX into the build at gyp time. | 179 # CXX into the build at gyp time. |
| 180 # TODO(sbc): Do this better by providing some gyp syntax | 180 # TODO(sbc): Do this better by providing some gyp syntax |
| 181 # for accessing the name of the configured compiler, or | 181 # for accessing the name of the configured compiler, or |
| 182 # even a better way to access gyp time environment | 182 # even a better way to access gyp time environment |
| 183 # variables from within a gyp file. | 183 # variables from within a gyp file. |
| 184 ['OS=="android"', { | 184 ['OS=="android"', { |
| 185 'variables': { | 185 'variables': { |
| 186 'compiler': '<!(/bin/echo -n <(android_toolchain)/*-g++)', | 186 'compiler': '<!(/bin/echo -n <(android_toolchain)/*-g++)', |
| 187 } | 187 } |
| 188 }], | |
| 189 ['OS!="android" and target_arch=="arm"', { | |
| 190 'variables': { | |
| 191 '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'
| |
| 192 } | |
| 188 }, { | 193 }, { |
| 189 'variables': { | 194 'variables': { |
| 190 'compiler': '<!(echo ${CXX:=g++})', | 195 'compiler': '<!(echo ${CXX:=g++})', |
| 191 } | 196 } |
| 192 }], | 197 }], |
| 193 ], | 198 ], |
| 194 'action': ['python', 'ld_bfd.py', | 199 'action': ['python', 'ld_bfd.py', |
| 195 '--compiler', '<(compiler)', | 200 '--compiler', '<(compiler)', |
| 196 '-m', '<(linker_emulation)', | 201 '-m', '<(linker_emulation)', |
| 197 '--build-id', | 202 '--build-id', |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 235 'inputs': ['nacl_bootstrap_munge_phdr.py', | 240 'inputs': ['nacl_bootstrap_munge_phdr.py', |
| 236 '<(PRODUCT_DIR)/nacl_bootstrap_munge_phdr', | 241 '<(PRODUCT_DIR)/nacl_bootstrap_munge_phdr', |
| 237 '<(PRODUCT_DIR)/nacl_bootstrap_raw'], | 242 '<(PRODUCT_DIR)/nacl_bootstrap_raw'], |
| 238 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], | 243 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], |
| 239 'message': 'Munging ELF program header', | 244 'message': 'Munging ELF program header', |
| 240 'action': ['python', '<@(_inputs)', '<@(_outputs)'] | 245 'action': ['python', '<@(_inputs)', '<@(_outputs)'] |
| 241 }], | 246 }], |
| 242 }, | 247 }, |
| 243 ], | 248 ], |
| 244 } | 249 } |
| OLD | NEW |