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

Side by Side Diff: build/common.gypi

Issue 24489002: Remove LINK entries in make_global_settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 2 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
« 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 4599 matching lines...) Expand 10 before | Expand all | Expand 10 after
4610 ], 4610 ],
4611 }, 4611 },
4612 }], 4612 }],
4613 ['clang==1', { 4613 ['clang==1', {
4614 'conditions': [ 4614 'conditions': [
4615 ['OS=="android"', { 4615 ['OS=="android"', {
4616 # Android could use the goma with clang. 4616 # Android could use the goma with clang.
4617 'make_global_settings': [ 4617 'make_global_settings': [
4618 ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(make _clang_dir)/bin/clang)'], 4618 ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(make _clang_dir)/bin/clang)'],
4619 ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(mak e_clang_dir)/bin/clang++)'], 4619 ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(mak e_clang_dir)/bin/clang++)'],
4620 ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(ma ke_clang_dir)/bin/clang++)'],
4621 ['CC.host', '$(CC)'], 4620 ['CC.host', '$(CC)'],
4622 ['CXX.host', '$(CXX)'], 4621 ['CXX.host', '$(CXX)'],
4623 ['LINK.host', '$(LINK)'],
4624 ], 4622 ],
4625 }, { 4623 }, {
4626 'make_global_settings': [ 4624 'make_global_settings': [
4627 ['CC', '<(make_clang_dir)/bin/clang'], 4625 ['CC', '<(make_clang_dir)/bin/clang'],
4628 ['CXX', '<(make_clang_dir)/bin/clang++'], 4626 ['CXX', '<(make_clang_dir)/bin/clang++'],
4629 ['LINK', '$(CXX)'],
4630 ['CC.host', '$(CC)'], 4627 ['CC.host', '$(CC)'],
4631 ['CXX.host', '$(CXX)'], 4628 ['CXX.host', '$(CXX)'],
4632 ['LINK.host', '$(LINK)'],
4633 ], 4629 ],
4634 }], 4630 }],
4635 ], 4631 ],
4636 }], 4632 }],
4637 ['OS=="android" and clang==0', { 4633 ['OS=="android" and clang==0', {
4638 # Hardcode the compiler names in the Makefile so that 4634 # Hardcode the compiler names in the Makefile so that
4639 # it won't depend on the environment at make time. 4635 # it won't depend on the environment at make time.
4640 'make_global_settings': [ 4636 'make_global_settings': [
4641 ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <(android_toolchain)/*-g cc)'], 4637 ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <(android_toolchain)/*-g cc)'],
4642 ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <(android_toolchain)/*- g++)'], 4638 ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <(android_toolchain)/*- g++)'],
4643 ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <(android_toolchain)/* -gcc)'],
4644 ['CC.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which gcc))'], 4639 ['CC.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which gcc))'],
4645 ['CXX.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'], 4640 ['CXX.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'],
4646 ['LINK.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'],
4647 ], 4641 ],
4648 }], 4642 }],
4649 ['OS=="linux" and target_arch=="mipsel"', { 4643 ['OS=="linux" and target_arch=="mipsel"', {
4650 'make_global_settings': [ 4644 'make_global_settings': [
4651 ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'], 4645 ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'],
4652 ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'], 4646 ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'],
4653 ['LINK', '$(CXX)'],
4654 ['CC.host', '<!(which gcc)'], 4647 ['CC.host', '<!(which gcc)'],
4655 ['CXX.host', '<!(which g++)'], 4648 ['CXX.host', '<!(which g++)'],
4656 ['LINK.host', '<!(which g++)'],
4657 ], 4649 ],
4658 }], 4650 }],
4659 ], 4651 ],
4660 'configurations': { 4652 'configurations': {
4661 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! 4653 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
4662 # This block adds *project-wide* configuration settings to each project 4654 # This block adds *project-wide* configuration settings to each project
4663 # file. It's almost always wrong to put things here. Specify your 4655 # file. It's almost always wrong to put things here. Specify your
4664 # custom |configurations| in target_defaults to add them to targets instead. 4656 # custom |configurations| in target_defaults to add them to targets instead.
4665 'conditions': [ 4657 'conditions': [
4666 ['OS=="ios"', { 4658 ['OS=="ios"', {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
4740 # settings in target dicts. SYMROOT is a special case, because many other 4732 # settings in target dicts. SYMROOT is a special case, because many other
4741 # Xcode variables depend on it, including variables such as 4733 # Xcode variables depend on it, including variables such as
4742 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4743 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4744 # files to appear (when present) in the UI as actual files and not red 4736 # files to appear (when present) in the UI as actual files and not red
4745 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4746 # and therefore SYMROOT, needs to be set at the project level. 4738 # and therefore SYMROOT, needs to be set at the project level.
4747 'SYMROOT': '<(DEPTH)/xcodebuild', 4739 'SYMROOT': '<(DEPTH)/xcodebuild',
4748 }, 4740 },
4749 } 4741 }
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