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 2965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2976 }], | 2976 }], |
| 2977 ['enable_ipc_fuzzer==1', { | 2977 ['enable_ipc_fuzzer==1', { |
| 2978 'defines': ['ENABLE_IPC_FUZZER=1'], | 2978 'defines': ['ENABLE_IPC_FUZZER=1'], |
| 2979 }], | 2979 }], |
| 2980 ['video_hole==1', { | 2980 ['video_hole==1', { |
| 2981 'defines': ['VIDEO_HOLE=1'], | 2981 'defines': ['VIDEO_HOLE=1'], |
| 2982 }], | 2982 }], |
| 2983 ['v8_use_external_startup_data==1', { | 2983 ['v8_use_external_startup_data==1', { |
| 2984 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'], | 2984 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'], |
| 2985 }], | 2985 }], |
| 2986 ['use_lto==1 and (target_arch=="ia32" or target_arch=="x64")', { | |
| 2987 # Required for third_party/zlib/crc_folding.c and various other code | |
| 2988 # that uses SSE. | |
| 2989 'ldflags+': ['-Wl,-plugin-opt,mcpu=corei7-avx'], | |
|
Nico
2015/01/29 18:48:01
nit: i think you don't need the +, gyp merges list
pcc
2015/01/29 19:11:13
Done.
| |
| 2990 }], | |
| 2986 ], # conditions for 'target_defaults' | 2991 ], # conditions for 'target_defaults' |
| 2987 'target_conditions': [ | 2992 'target_conditions': [ |
| 2988 ['<(use_libpci)==1', { | 2993 ['<(use_libpci)==1', { |
| 2989 'defines': ['USE_LIBPCI=1'], | 2994 'defines': ['USE_LIBPCI=1'], |
| 2990 }], | 2995 }], |
| 2991 ['<(use_openssl)==1', { | 2996 ['<(use_openssl)==1', { |
| 2992 'defines': ['USE_OPENSSL=1'], | 2997 'defines': ['USE_OPENSSL=1'], |
| 2993 }], | 2998 }], |
| 2994 ['<(use_openssl_certs)==1', { | 2999 ['<(use_openssl_certs)==1', { |
| 2995 'defines': ['USE_OPENSSL_CERTS=1'], | 3000 'defines': ['USE_OPENSSL_CERTS=1'], |
| (...skipping 2778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5774 ['CC.host_wrapper', '<(gomadir)/gomacc'], | 5779 ['CC.host_wrapper', '<(gomadir)/gomacc'], |
| 5775 ['CXX.host_wrapper', '<(gomadir)/gomacc'], | 5780 ['CXX.host_wrapper', '<(gomadir)/gomacc'], |
| 5776 ], | 5781 ], |
| 5777 }], | 5782 }], |
| 5778 ['use_lto==1', { | 5783 ['use_lto==1', { |
| 5779 'target_defaults': { | 5784 'target_defaults': { |
| 5780 'target_conditions': [ | 5785 'target_conditions': [ |
| 5781 ['_toolset=="target"', { | 5786 ['_toolset=="target"', { |
| 5782 'cflags': [ | 5787 'cflags': [ |
| 5783 '-flto', | 5788 '-flto', |
| 5789 ], | |
| 5790 }], | |
| 5791 ], | |
| 5792 }, | |
| 5793 }], | |
| 5794 ['use_lto==1 and clang==0', { | |
| 5795 'target_defaults': { | |
| 5796 'target_conditions': [ | |
| 5797 ['_toolset=="target"', { | |
| 5798 'cflags': [ | |
| 5784 '-ffat-lto-objects', | 5799 '-ffat-lto-objects', |
| 5785 ], | 5800 ], |
| 5786 }], | 5801 }], |
| 5787 ], | 5802 ], |
| 5788 }, | 5803 }, |
| 5789 }], | 5804 }], |
| 5790 ['use_lto==1 or use_lto_o2==1', { | 5805 ['(use_lto==1 or use_lto_o2==1) and clang==0', { |
| 5791 'target_defaults': { | 5806 'target_defaults': { |
| 5792 'target_conditions': [ | 5807 'target_conditions': [ |
| 5793 ['_toolset=="target"', { | 5808 ['_toolset=="target"', { |
| 5794 'ldflags': [ | 5809 'ldflags': [ |
| 5795 '-flto=32', | 5810 '-flto=32', |
| 5796 ], | 5811 ], |
| 5797 }], | 5812 }], |
| 5798 ], | 5813 ], |
| 5799 }, | 5814 }, |
| 5800 }], | 5815 }], |
| 5816 ['(use_lto==1 or use_lto_o2==1) and clang==1', { | |
| 5817 'target_defaults': { | |
| 5818 'target_conditions': [ | |
| 5819 ['_toolset=="target"', { | |
| 5820 'ldflags': [ | |
| 5821 '-flto', | |
|
Nico
2015/01/29 18:48:01
i'd be nice if gcc's and clang's flag here were co
| |
| 5822 ], | |
| 5823 }], | |
| 5824 ], | |
| 5825 }, | |
| 5826 }], | |
| 5801 ], | 5827 ], |
| 5802 'xcode_settings': { | 5828 'xcode_settings': { |
| 5803 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! | 5829 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! |
| 5804 # This block adds *project-wide* configuration settings to each project | 5830 # This block adds *project-wide* configuration settings to each project |
| 5805 # file. It's almost always wrong to put things here. Specify your | 5831 # file. It's almost always wrong to put things here. Specify your |
| 5806 # custom xcode_settings in target_defaults to add them to targets instead. | 5832 # custom xcode_settings in target_defaults to add them to targets instead. |
| 5807 | 5833 |
| 5808 'conditions': [ | 5834 'conditions': [ |
| 5809 # In an Xcode Project Info window, the "Base SDK for All Configurations" | 5835 # In an Xcode Project Info window, the "Base SDK for All Configurations" |
| 5810 # setting sets the SDK on a project-wide basis. In order to get the | 5836 # setting sets the SDK on a project-wide basis. In order to get the |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5861 # settings in target dicts. SYMROOT is a special case, because many other | 5887 # settings in target dicts. SYMROOT is a special case, because many other |
| 5862 # Xcode variables depend on it, including variables such as | 5888 # Xcode variables depend on it, including variables such as |
| 5863 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5889 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5864 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5890 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5865 # files to appear (when present) in the UI as actual files and not red | 5891 # files to appear (when present) in the UI as actual files and not red |
| 5866 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5892 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5867 # and therefore SYMROOT, needs to be set at the project level. | 5893 # and therefore SYMROOT, needs to be set at the project level. |
| 5868 'SYMROOT': '<(DEPTH)/xcodebuild', | 5894 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5869 }, | 5895 }, |
| 5870 } | 5896 } |
| OLD | NEW |