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

Unified Diff: build/toolchain/linux/BUILD.gn

Issue 239543013: Work on Mac GN build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix line endings Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: build/toolchain/linux/BUILD.gn
diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
index 62e727817a5c29699738ee8e221dd795a6fd3a01..dd98cb4e0e36e69a868cb937fae508d1f0685089 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -7,46 +7,6 @@ import("//build/toolchain/clang.gni")
import("//build/toolchain/gcc_toolchain.gni")
import("//build/toolchain/goma.gni")
-if (is_gyp) {
- # Set the compilers for GYP to use. This logic is only relevant to GYP where
- # there is "a" target compiler. In native GN builds, we have separate
- # compilers for the toolchains below, any or all of which could be active in
- # any given build.
- if (is_clang) {
- # Set the GYP header for all toolchains when running under Clang.
- make_global_settings = make_clang_global_settings
- } else {
- if (cpu_arch == "mipsel") {
- make_global_settings =
- "['CC', '$sysroot/../bin/mipsel-linux-gnu-gcc']," +
- "['CXX', '$sysroot/../bin/mipsel-linux-gnu-g++']," +
- "['CC.host', '/usr/bin/gcc']," +
- "['CXX.host', '/usr/bin/g++'],"
- } else {
- make_global_settings = ""
- }
- }
-
- if (use_goma) {
- # There is a TODO(yyanagisawa) in common.gypi about the make generator not
- # supporting CC_wrapper without CC. As a result, we must add a condition
- # when on the generator when we're not explicitly setting the variables
- # above (which happens when gyp_header is empty at this point).
- #
- # GYP will interpret the file once for each generator, so we have to write
- # this condition into the GYP file since the user could have more than one
- # generator set.
- gyp_header =
- "'conditions':" +
- "[['\"<(GENERATOR)\"==\"ninja\"', { 'make_global_settings': [" +
- make_global_settings +
- make_goma_global_settings +
- "]}]],"
- } else {
- gyp_header = "'make_global_settings': [" + make_global_settings + "],"
- }
-}
-
gcc_toolchain("arm") {
cc = "arm-linux-gnueabi-gcc"
cxx = "arm-linux-gnueabi-g++"
« no previous file with comments | « build/toolchain/clang.gni ('k') | build/toolchain/mac/BUILD.gn » ('j') | skia/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698