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 2297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2308 ], | 2308 ], |
2309 }], | 2309 }], |
2310 ], | 2310 ], |
2311 }], | 2311 }], |
2312 ['tsan==1', { | 2312 ['tsan==1', { |
2313 'target_conditions': [ | 2313 'target_conditions': [ |
2314 ['_toolset=="target"', { | 2314 ['_toolset=="target"', { |
2315 'cflags': [ | 2315 'cflags': [ |
2316 '-fthread-sanitizer', | 2316 '-fthread-sanitizer', |
2317 '-fno-omit-frame-pointer', | 2317 '-fno-omit-frame-pointer', |
2318 '-fPIE', | 2318 '-fPIE', |
Nico
2012/07/20 18:06:11
But you do want -fPIE for non-executables?
Alexander Potapenko
2012/07/25 08:36:44
Yes. Non-executables can share object files with e
| |
2319 ], | 2319 ], |
2320 'ldflags': [ | 2320 'ldflags': [ |
2321 '-fthread-sanitizer', | 2321 '-fthread-sanitizer', |
2322 '-pie', | |
2323 ], | 2322 ], |
2324 'defines': [ | 2323 'defines': [ |
2325 'THREAD_SANITIZER', | 2324 'THREAD_SANITIZER', |
2326 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1', | 2325 'DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1', |
2327 ], | 2326 ], |
2327 'target_conditions': [ | |
2328 ['_type=="executable"', { | |
2329 'ldflags': [ | |
2330 '-pie', | |
2331 ], | |
Nico
2012/07/20 18:06:11
nit: we use 2 spaces indent in gyp files, not 4. m
Alexander Potapenko
2012/07/25 08:36:44
Done.
| |
2332 }], | |
2333 ], | |
2328 }], | 2334 }], |
2329 ], | 2335 ], |
2330 }], | 2336 }], |
2331 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', { | 2337 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', { |
2332 'target_conditions' : [ | 2338 'target_conditions' : [ |
2333 ['_toolset=="target"', { | 2339 ['_toolset=="target"', { |
2334 'cflags': [ | 2340 'cflags': [ |
2335 '-finstrument-functions', | 2341 '-finstrument-functions', |
2336 ], | 2342 ], |
2337 }], | 2343 }], |
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3282 # settings in target dicts. SYMROOT is a special case, because many other | 3288 # settings in target dicts. SYMROOT is a special case, because many other |
3283 # Xcode variables depend on it, including variables such as | 3289 # Xcode variables depend on it, including variables such as |
3284 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3290 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
3285 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3291 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
3286 # files to appear (when present) in the UI as actual files and not red | 3292 # files to appear (when present) in the UI as actual files and not red |
3287 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3293 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
3288 # and therefore SYMROOT, needs to be set at the project level. | 3294 # and therefore SYMROOT, needs to be set at the project level. |
3289 'SYMROOT': '<(DEPTH)/xcodebuild', | 3295 'SYMROOT': '<(DEPTH)/xcodebuild', |
3290 }, | 3296 }, |
3291 } | 3297 } |
OLD | NEW |