| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| 8 # code, as opposed to external code. This variable is used to control | 8 # code, as opposed to external code. This variable is used to control |
| 9 # such things as the set of warnings to enable, and whether warnings are | 9 # such things as the set of warnings to enable, and whether warnings are |
| 10 # treated as errors. | 10 # treated as errors. |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 '-mfpmath=sse', | 128 '-mfpmath=sse', |
| 129 ], | 129 ], |
| 130 'linkflags': [ | 130 'linkflags': [ |
| 131 '-m32', | 131 '-m32', |
| 132 '-pthread', | 132 '-pthread', |
| 133 ], | 133 ], |
| 134 'scons_variable_settings': { | 134 'scons_variable_settings': { |
| 135 'LIBPATH': ['$LIB_DIR'], | 135 'LIBPATH': ['$LIB_DIR'], |
| 136 # Linking of large files uses lots of RAM, so serialize links | 136 # Linking of large files uses lots of RAM, so serialize links |
| 137 # using the handy flock command from util-linux. | 137 # using the handy flock command from util-linux. |
| 138 'FLOCK_LINK': ['flock', '$DESTINATION_ROOT/linker.lock', '$LINK'], | 138 'FLOCK_LINK': ['flock', '$TOP_BUILDDIR/linker.lock', '$LINK'], |
| 139 | 139 |
| 140 # We have several cases where archives depend on each other in | 140 # We have several cases where archives depend on each other in |
| 141 # a cyclic fashion. Since the GNU linker does only a single | 141 # a cyclic fashion. Since the GNU linker does only a single |
| 142 # pass over the archives we surround the libraries with | 142 # pass over the archives we surround the libraries with |
| 143 # --start-group and --end-group (aka -( and -) ). That causes | 143 # --start-group and --end-group (aka -( and -) ). That causes |
| 144 # ld to loop over the group until no more undefined symbols | 144 # ld to loop over the group until no more undefined symbols |
| 145 # are found. In an ideal world we would only make groups from | 145 # are found. In an ideal world we would only make groups from |
| 146 # those libraries which we knew to be in cycles. However, | 146 # those libraries which we knew to be in cycles. However, |
| 147 # that's tough with SCons, so we bodge it by making all the | 147 # that's tough with SCons, so we bodge it by making all the |
| 148 # archives a group by redefining the linking command here. | 148 # archives a group by redefining the linking command here. |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 }, | 297 }, |
| 298 }], | 298 }], |
| 299 ['chromium_code==0', { | 299 ['chromium_code==0', { |
| 300 # This section must follow the other conditon sections above because | 300 # This section must follow the other conditon sections above because |
| 301 # external_code.gypi expects to be merged into those settings. | 301 # external_code.gypi expects to be merged into those settings. |
| 302 'includes': [ | 302 'includes': [ |
| 303 'external_code.gypi', | 303 'external_code.gypi', |
| 304 ], | 304 ], |
| 305 }], | 305 }], |
| 306 ], | 306 ], |
| 307 'scons_settings': { |
| 308 'sconsbuild_dir': '<(DEPTH)/sconsbuild', |
| 309 }, |
| 307 'xcode_settings': { | 310 'xcode_settings': { |
| 308 # The Xcode generator will look for an xcode_settings section at the root | 311 # The Xcode generator will look for an xcode_settings section at the root |
| 309 # of each dict and use it to apply settings on a file-wide basis. Most | 312 # of each dict and use it to apply settings on a file-wide basis. Most |
| 310 # settings should not be here, they should be in target-specific | 313 # settings should not be here, they should be in target-specific |
| 311 # xcode_settings sections, or better yet, should use non-Xcode-specific | 314 # xcode_settings sections, or better yet, should use non-Xcode-specific |
| 312 # settings in target dicts. SYMROOT is a special case, because many other | 315 # settings in target dicts. SYMROOT is a special case, because many other |
| 313 # Xcode variables depend on it, including variables such as | 316 # Xcode variables depend on it, including variables such as |
| 314 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 317 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 315 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 318 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 316 # files to appear (when present) in the UI as actual files and not red | 319 # files to appear (when present) in the UI as actual files and not red |
| 317 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 320 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 318 # and therefore SYMROOT, needs to be set at the project level. | 321 # and therefore SYMROOT, needs to be set at the project level. |
| 319 'SYMROOT': '<(DEPTH)/xcodebuild', | 322 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 320 }, | 323 }, |
| 321 } | 324 } |
| OLD | NEW |