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

Side by Side Diff: build/toolchain/gcc_toolchain.gni

Issue 2870553002: Avoid importing nacl config inside gcc_toolchain.gni for non-NaCl toolchains (Closed)
Patch Set: Created 3 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/clang/clang.gni") 6 import("//build/config/clang/clang.gni")
7 import("//build/config/nacl/config.gni")
8 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
9 import("//build/config/v8_target_cpu.gni") 8 import("//build/config/v8_target_cpu.gni")
10 import("//build/toolchain/cc_wrapper.gni") 9 import("//build/toolchain/cc_wrapper.gni")
11 import("//build/toolchain/clang_static_analyzer.gni") 10 import("//build/toolchain/clang_static_analyzer.gni")
12 import("//build/toolchain/goma.gni") 11 import("//build/toolchain/goma.gni")
13 import("//build/toolchain/toolchain.gni") 12 import("//build/toolchain/toolchain.gni")
14 13
14 if (is_nacl) {
15 # To keep NaCl variables out of builds that don't include NaCl, all
16 # variables defined in nacl/config.gni referenced here should be protected by
17 # is_nacl conditions.
18 import("//build/config/nacl/config.gni")
19 }
20
15 # Path to the Clang static analysis wrapper script. 21 # Path to the Clang static analysis wrapper script.
16 # REVIEWERS: can you suggest a better location for this? 22 # REVIEWERS: can you suggest a better location for this?
17 # GN is really picky about dead stores of variables except at the global scope. 23 # GN is really picky about dead stores of variables except at the global scope.
18 analyzer_wrapper = 24 analyzer_wrapper =
19 rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", 25 rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
20 root_build_dir) + " --mode=clang" 26 root_build_dir) + " --mode=clang"
21 27
22 # This template defines a toolchain for something that works like gcc 28 # This template defines a toolchain for something that works like gcc
23 # (including clang). 29 # (including clang).
24 # 30 #
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 ]) 572 ])
567 573
568 toolchain_args = { 574 toolchain_args = {
569 if (defined(invoker.toolchain_args)) { 575 if (defined(invoker.toolchain_args)) {
570 forward_variables_from(invoker.toolchain_args, "*") 576 forward_variables_from(invoker.toolchain_args, "*")
571 } 577 }
572 is_clang = true 578 is_clang = true
573 } 579 }
574 } 580 }
575 } 581 }
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