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

Side by Side Diff: src/trusted/service_runtime/linux/BUILD.gn

Issue 1805353002: Do not pass default values from GN to ld_bfd.py if CXX is specified (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Check if defined Created 4 years, 9 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) 2014 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2014 The Native Client 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 # We use a special toolchain to build nacl_helper_bootstrap. This 5 # We use a special toolchain to build nacl_helper_bootstrap. This
6 # seems a bit excessive for compiling one source file. But it is 6 # seems a bit excessive for compiling one source file. But it is
7 # the most reasonable way to instantiate the configs with different 7 # the most reasonable way to instantiate the configs with different
8 # settings such as use_gold=false. The minimal set of configs used 8 # settings such as use_gold=false. The minimal set of configs used
9 # for that file (see below) will sometimes try to use the switch 9 # for that file (see below) will sometimes try to use the switch
10 # -gsplit-dwarf under use_gold=true. But without some other configs 10 # -gsplit-dwarf under use_gold=true. But without some other configs
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 if (is_android) { 45 if (is_android) {
46 compiler = "g++" 46 compiler = "g++"
47 } else if (current_cpu == "arm") { 47 } else if (current_cpu == "arm") {
48 compiler = "arm-linux-gnueabihf-g++" 48 compiler = "arm-linux-gnueabihf-g++"
49 } else { 49 } else {
50 compiler = "g++" 50 compiler = "g++"
51 } 51 }
52 52
53 if (target_os == "chromeos" && defined(cros_target_cxx) &&
54 cros_target_cxx != "") {
55 compiler = cros_target_cxx
56 }
57
53 static_library("nacl_bootstrap_lib") { 58 static_library("nacl_bootstrap_lib") {
54 # This code has very specific requirements related to its static 59 # This code has very specific requirements related to its static
55 # linking and minimal libc use. It cannot support the normal variety 60 # linking and minimal libc use. It cannot support the normal variety
56 # of build configs that the rest of the code is built with. So it 61 # of build configs that the rest of the code is built with. So it
57 # resets the list of configsto empty, and then builds up from scratch 62 # resets the list of configsto empty, and then builds up from scratch
58 # using only the basics that work here. 63 # using only the basics that work here.
59 configs = [] 64 configs = []
60 configs += [ 65 configs += [
61 "//build/config/compiler:compiler_cpu_abi", 66 "//build/config/compiler:compiler_cpu_abi",
62 "//build/config/compiler:runtime_library", 67 "//build/config/compiler:runtime_library",
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 copy("bootstrap") { 160 copy("bootstrap") {
156 bootstrap = ":munge_nacl_helper_bootstrap($bootstrap_toolchain)" 161 bootstrap = ":munge_nacl_helper_bootstrap($bootstrap_toolchain)"
157 162
158 bootstrap_out_dir = get_label_info(bootstrap, "root_out_dir") 163 bootstrap_out_dir = get_label_info(bootstrap, "root_out_dir")
159 164
160 deps = [ bootstrap ] 165 deps = [ bootstrap ]
161 sources = [ "$bootstrap_out_dir/nacl_helper_bootstrap" ] 166 sources = [ "$bootstrap_out_dir/nacl_helper_bootstrap" ]
162 outputs = [ "$root_out_dir/nacl_helper_bootstrap" ] 167 outputs = [ "$root_out_dir/nacl_helper_bootstrap" ]
163 } 168 }
164 } 169 }
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