OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium 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 # IMPORTANT: | 5 # IMPORTANT: |
6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
8 { | 8 { |
9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
(...skipping 4214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4225 'cflags!': [ | 4225 'cflags!': [ |
4226 # Clang does not support the following options. | 4226 # Clang does not support the following options. |
4227 '-finline-limit=64', | 4227 '-finline-limit=64', |
4228 ], | 4228 ], |
4229 'cflags': [ | 4229 'cflags': [ |
4230 # TODO(gordanac) Enable integrated-as. | 4230 # TODO(gordanac) Enable integrated-as. |
4231 '-no-integrated-as', | 4231 '-no-integrated-as', |
4232 ], | 4232 ], |
4233 }], | 4233 }], |
4234 ['clang==1 and OS=="android"', { | 4234 ['clang==1 and OS=="android"', { |
4235 'cflags': [ | |
4236 '-B<(android_toolchain)', # Else /usr/bin/as gets picked up. | |
Nico
2015/12/04 18:50:31
Can you put this next to the -no-integrated-as lin
gordanac
2015/12/04 19:27:01
Done.
| |
4237 ], | |
4235 'ldflags': [ | 4238 'ldflags': [ |
4236 # Let clang find the ld in the NDK. | 4239 # Let clang find the ld in the NDK. |
4237 '--gcc-toolchain=<(android_toolchain)/..', | 4240 '--gcc-toolchain=<(android_toolchain)/..', |
4238 ], | 4241 ], |
4239 }], | 4242 }], |
4240 ['mips_dsp_rev==1', { | 4243 ['mips_dsp_rev==1', { |
4241 'cflags': ['-mdsp'], | 4244 'cflags': ['-mdsp'], |
4242 }], | 4245 }], |
4243 ['mips_dsp_rev==2', { | 4246 ['mips_dsp_rev==2', { |
4244 'cflags': ['-mdspr2'], | 4247 'cflags': ['-mdspr2'], |
(...skipping 2125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6370 # settings in target dicts. SYMROOT is a special case, because many other | 6373 # settings in target dicts. SYMROOT is a special case, because many other |
6371 # Xcode variables depend on it, including variables such as | 6374 # Xcode variables depend on it, including variables such as |
6372 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6375 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6373 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6376 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6374 # files to appear (when present) in the UI as actual files and not red | 6377 # files to appear (when present) in the UI as actual files and not red |
6375 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6378 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6376 # and therefore SYMROOT, needs to be set at the project level. | 6379 # and therefore SYMROOT, needs to be set at the project level. |
6377 'SYMROOT': '<(DEPTH)/xcodebuild', | 6380 'SYMROOT': '<(DEPTH)/xcodebuild', |
6378 }, | 6381 }, |
6379 } | 6382 } |
OLD | NEW |