Chromium Code Reviews| 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 3368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3379 # enabled when not building on Chrome OS. | 3379 # enabled when not building on Chrome OS. |
| 3380 # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc | 3380 # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc |
| 3381 # supports it. | 3381 # supports it. |
| 3382 'target_defaults': { | 3382 'target_defaults': { |
| 3383 'cflags': [ | 3383 'cflags': [ |
| 3384 '-fstack-protector', | 3384 '-fstack-protector', |
| 3385 '--param=ssp-buffer-size=4', | 3385 '--param=ssp-buffer-size=4', |
| 3386 ], | 3386 ], |
| 3387 }, | 3387 }, |
| 3388 }], | 3388 }], |
| 3389 ['OS=="linux" and target_arch=="arm" and host_arch!="arm" and chromeos==0 an d clang==0', { | |
| 3390 # Some sensible defaults for ARM cross compiling on linux. These can be o verridden | |
|
Mark Seaborn
2014/07/28 15:55:20
Line is >80 chars
Sam Clegg
2014/07/29 00:28:11
There are other occurrences of conditions in this
| |
| 3391 # using CC/CXX/etc environment variables. | |
| 3392 'make_global_settings': [ | |
| 3393 ['CC', '<!(which arm-linux-gnueabihf-gcc)'], | |
|
Mark Seaborn
2014/07/28 15:55:20
The bot configs also set AR, AS and RANLIB (see ht
Sam Clegg
2014/07/29 00:28:11
Apparently not. Its hard to be 100% since there a
| |
| 3394 ['CXX', '<!(which arm-linux-gnueabihf-g++)'], | |
| 3395 ['CC.host', '<!(which gcc)'], | |
| 3396 ['CXX.host', '<!(which g++)'], | |
| 3397 ], | |
| 3398 }], | |
| 3389 ['os_posix==1 and OS!="mac" and OS!="ios"', { | 3399 ['os_posix==1 and OS!="mac" and OS!="ios"', { |
| 3390 'target_defaults': { | 3400 'target_defaults': { |
| 3391 # Enable -Werror by default, but put it in a variable so it can | 3401 # Enable -Werror by default, but put it in a variable so it can |
| 3392 # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 3402 # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
| 3393 'variables': { | 3403 'variables': { |
| 3394 'werror%': '-Werror', | 3404 'werror%': '-Werror', |
| 3395 'libraries_for_target%': '', | 3405 'libraries_for_target%': '', |
| 3396 }, | 3406 }, |
| 3397 'defines': [ | 3407 'defines': [ |
| 3398 '_FILE_OFFSET_BITS=64', | 3408 '_FILE_OFFSET_BITS=64', |
| (...skipping 2171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5570 # it won't depend on the environment at make time. | 5580 # it won't depend on the environment at make time. |
| 5571 'make_global_settings': [ | 5581 'make_global_settings': [ |
| 5572 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'], | 5582 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'], |
| 5573 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'], | 5583 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'], |
| 5574 ['CC.host', '<!(which gcc)'], | 5584 ['CC.host', '<!(which gcc)'], |
| 5575 ['CXX.host', '<!(which g++)'], | 5585 ['CXX.host', '<!(which g++)'], |
| 5576 ], | 5586 ], |
| 5577 }], | 5587 }], |
| 5578 ['OS=="linux" and target_arch=="mipsel"', { | 5588 ['OS=="linux" and target_arch=="mipsel"', { |
| 5579 'make_global_settings': [ | 5589 'make_global_settings': [ |
| 5580 ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'], | 5590 ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'], |
|
Mark Seaborn
2014/07/28 15:55:20
Should your code go after these blocks, which are
Nico
2014/07/28 16:01:40
+1, if that works that'd be better.
Sam Clegg
2014/07/29 00:28:11
Done.
Sam Clegg
2014/07/29 00:28:11
Done.
| |
| 5581 ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'], | 5591 ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'], |
| 5582 ['CC.host', '<!(which gcc)'], | 5592 ['CC.host', '<!(which gcc)'], |
| 5583 ['CXX.host', '<!(which g++)'], | 5593 ['CXX.host', '<!(which g++)'], |
| 5584 ], | 5594 ], |
| 5585 }], | 5595 }], |
| 5586 | 5596 |
| 5587 # TODO(yyanagisawa): supports GENERATOR==make | 5597 # TODO(yyanagisawa): supports GENERATOR==make |
| 5588 # make generator doesn't support CC_wrapper without CC | 5598 # make generator doesn't support CC_wrapper without CC |
| 5589 # in make_global_settings yet. | 5599 # in make_global_settings yet. |
| 5590 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { | 5600 ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5658 # settings in target dicts. SYMROOT is a special case, because many other | 5668 # settings in target dicts. SYMROOT is a special case, because many other |
| 5659 # Xcode variables depend on it, including variables such as | 5669 # Xcode variables depend on it, including variables such as |
| 5660 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5670 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5661 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5671 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5662 # files to appear (when present) in the UI as actual files and not red | 5672 # files to appear (when present) in the UI as actual files and not red |
| 5663 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5673 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5664 # and therefore SYMROOT, needs to be set at the project level. | 5674 # and therefore SYMROOT, needs to be set at the project level. |
| 5665 'SYMROOT': '<(DEPTH)/xcodebuild', | 5675 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5666 }, | 5676 }, |
| 5667 } | 5677 } |
| OLD | NEW |