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

Side by Side Diff: build/common.gypi

Issue 901843004: Forcefully set the right gyp variables for 32-bit Linux builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 1573 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 'nacl_untrusted_build%': 0, 1584 'nacl_untrusted_build%': 0,
1585 'use_allocator%': 'none', 1585 'use_allocator%': 'none',
1586 }], 1586 }],
1587 ['OS=="linux" and target_arch=="mipsel"', { 1587 ['OS=="linux" and target_arch=="mipsel"', {
1588 'sysroot%': '<(sysroot)', 1588 'sysroot%': '<(sysroot)',
1589 'CXX%': '<(CXX)', 1589 'CXX%': '<(CXX)',
1590 }], 1590 }],
1591 # Use a 64-bit linker to avoid running out of address space. The 1591 # Use a 64-bit linker to avoid running out of address space. The
1592 # buildbots should have a 64-bit kernel and a 64-bit libc installed. 1592 # buildbots should have a 64-bit kernel and a 64-bit libc installed.
1593 ['host_arch=="ia32" and target_arch=="ia32"', { 1593 ['host_arch=="ia32" and target_arch=="ia32"', {
1594 # TODO(thestig) This is a horrible way to force the desired
1595 # configuration. Our gyp variable scoping is likely wrong and
1596 # needs to be cleaned up. The GN configuration should be changed
1597 # to match.
1598 'binutils_version%': 224,
1599 'linux_use_bundled_binutils%': '1',
1594 'linux_use_bundled_gold%': '1', 1600 'linux_use_bundled_gold%': '1',
1595 'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin', 1601 'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin',
1596 }], 1602 }],
1597 # All Chrome builds have breakpad symbols, but only process the 1603 # All Chrome builds have breakpad symbols, but only process the
1598 # symbols from official builds. 1604 # symbols from official builds.
1599 ['(branding=="Chrome" and buildtype=="Official")', { 1605 ['(branding=="Chrome" and buildtype=="Official")', {
1600 'linux_dump_symbols%': 1, 1606 'linux_dump_symbols%': 1,
1601 1607
1602 # Omit unwind support in official release builds to save space. We 1608 # Omit unwind support in official release builds to save space. We
1603 # can use breakpad for these builds. 1609 # can use breakpad for these builds.
(...skipping 4281 matching lines...) Expand 10 before | Expand all | Expand 10 after
5885 # settings in target dicts. SYMROOT is a special case, because many other 5891 # settings in target dicts. SYMROOT is a special case, because many other
5886 # Xcode variables depend on it, including variables such as 5892 # Xcode variables depend on it, including variables such as
5887 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5893 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5888 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5894 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5889 # files to appear (when present) in the UI as actual files and not red 5895 # files to appear (when present) in the UI as actual files and not red
5890 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5896 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5891 # and therefore SYMROOT, needs to be set at the project level. 5897 # and therefore SYMROOT, needs to be set at the project level.
5892 'SYMROOT': '<(DEPTH)/xcodebuild', 5898 'SYMROOT': '<(DEPTH)/xcodebuild',
5893 }, 5899 },
5894 } 5900 }
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