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

Side by Side Diff: build/common.gypi

Issue 1132853010: do not hardcode -I/usr/include32 when cross-compiling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3843 matching lines...) Expand 10 before | Expand all | Expand 10 after
3854 'ldflags': [ 3854 'ldflags': [
3855 '-fuse-ld=gold', 3855 '-fuse-ld=gold',
3856 ], 3856 ],
3857 }], 3857 }],
3858 # Install packages have started cropping up with 3858 # Install packages have started cropping up with
3859 # different headers between the 32-bit and 64-bit 3859 # different headers between the 32-bit and 64-bit
3860 # versions, so we have to shadow those differences off 3860 # versions, so we have to shadow those differences off
3861 # and make sure a 32-bit-on-64-bit build picks up the 3861 # and make sure a 32-bit-on-64-bit build picks up the
3862 # right files. 3862 # right files.
3863 # For android build, use NDK headers instead of host headers 3863 # For android build, use NDK headers instead of host headers
3864 ['host_arch!="ia32" and OS!="android"', { 3864 ['host_arch!="ia32" and OS!="android" and use_sysroot!=1', {
3865 'include_dirs+': [ 3865 'include_dirs+': [
3866 '/usr/include32', 3866 '/usr/include32',
3867 ], 3867 ],
3868 }], 3868 }],
3869 ], 3869 ],
3870 }], 3870 }],
3871 ], 3871 ],
3872 }], 3872 }],
3873 ['target_arch=="x64"', { 3873 ['target_arch=="x64"', {
3874 'target_conditions': [ 3874 'target_conditions': [
(...skipping 2314 matching lines...) Expand 10 before | Expand all | Expand 10 after
6189 # settings in target dicts. SYMROOT is a special case, because many other 6189 # settings in target dicts. SYMROOT is a special case, because many other
6190 # Xcode variables depend on it, including variables such as 6190 # Xcode variables depend on it, including variables such as
6191 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6191 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6192 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6192 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6193 # files to appear (when present) in the UI as actual files and not red 6193 # files to appear (when present) in the UI as actual files and not red
6194 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6194 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6195 # and therefore SYMROOT, needs to be set at the project level. 6195 # and therefore SYMROOT, needs to be set at the project level.
6196 'SYMROOT': '<(DEPTH)/xcodebuild', 6196 'SYMROOT': '<(DEPTH)/xcodebuild',
6197 }, 6197 },
6198 } 6198 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698