Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Side by Side Diff: build/common.gypi

Issue 264613005: Change the way libc++ is linked when use_custom_libcxx=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nuke commented lines Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 3766 matching lines...) Expand 10 before | Expand all | Expand 10 after
3777 }], 3777 }],
3778 ], 3778 ],
3779 }], 3779 }],
3780 ['use_instrumented_libraries==1', { 3780 ['use_instrumented_libraries==1', {
3781 'dependencies': [ 3781 'dependencies': [
3782 '<(DEPTH)/third_party/instrumented_libraries/instrumented_librarie s.gyp:instrumented_libraries', 3782 '<(DEPTH)/third_party/instrumented_libraries/instrumented_librarie s.gyp:instrumented_libraries',
3783 ], 3783 ],
3784 }], 3784 }],
3785 ['use_custom_libcxx==1', { 3785 ['use_custom_libcxx==1', {
3786 'dependencies': [ 3786 'dependencies': [
3787 '<(DEPTH)/third_party/libc++/libc++.gyp:libc++', 3787 '<(DEPTH)/third_party/libc++/libc++.gyp:libcxx_proxy',
3788 '<(DEPTH)/third_party/libc++abi/libc++abi.gyp:libc++abi',
3789 ], 3788 ],
3790 }], 3789 }],
3791 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', { 3790 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', {
3792 'target_conditions' : [ 3791 'target_conditions' : [
3793 ['_toolset=="target"', { 3792 ['_toolset=="target"', {
3794 'cflags': [ 3793 'cflags': [
3795 '-finstrument-functions', 3794 '-finstrument-functions',
3796 # Allow mmx intrinsics to inline, so that the 3795 # Allow mmx intrinsics to inline, so that the
3797 #0 compiler can expand the intrinsics. 3796 #0 compiler can expand the intrinsics.
3798 '-finstrument-functions-exclude-file-list=mmintrin.h', 3797 '-finstrument-functions-exclude-file-list=mmintrin.h',
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
5234 # settings in target dicts. SYMROOT is a special case, because many other 5233 # settings in target dicts. SYMROOT is a special case, because many other
5235 # Xcode variables depend on it, including variables such as 5234 # Xcode variables depend on it, including variables such as
5236 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5235 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5237 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5236 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5238 # files to appear (when present) in the UI as actual files and not red 5237 # files to appear (when present) in the UI as actual files and not red
5239 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5238 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5240 # and therefore SYMROOT, needs to be set at the project level. 5239 # and therefore SYMROOT, needs to be set at the project level.
5241 'SYMROOT': '<(DEPTH)/xcodebuild', 5240 'SYMROOT': '<(DEPTH)/xcodebuild',
5242 }, 5241 },
5243 } 5242 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | third_party/libc++/libc++.gyp » ('j') | third_party/libc++/libc++.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698