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

Side by Side Diff: build/toolchain/nacl/BUILD.gn

Issue 1366153002: Use host instead of current OS for NaCl toolchain location (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 import("//build/config/sysroot.gni") 5 import("//build/config/sysroot.gni")
6 import("//build/toolchain/nacl_toolchain.gni") 6 import("//build/toolchain/nacl_toolchain.gni")
7 7
8 nacl_toolchain_dir = rebase_path("//native_client/toolchain", root_build_dir) 8 nacl_toolchain_dir = rebase_path("//native_client/toolchain", root_build_dir)
9 os_toolchain_dir = "${nacl_toolchain_dir}/${current_os}_x86" 9 os_toolchain_dir = "${nacl_toolchain_dir}/${host_os}_x86"
10 10
11 # Add the toolchain revision as a preprocessor define so that sources are 11 # Add the toolchain revision as a preprocessor define so that sources are
12 # rebuilt when a toolchain is updated. 12 # rebuilt when a toolchain is updated.
13 # Idea we could use the toolchain deps feature, but currently that feature is 13 # Idea we could use the toolchain deps feature, but currently that feature is
14 # bugged and does not trigger a rebuild. 14 # bugged and does not trigger a rebuild.
15 # https://code.google.com/p/chromium/issues/detail?id=431880 15 # https://code.google.com/p/chromium/issues/detail?id=431880
16 # Calls to get the toolchain revision are relatively slow, so do them all in a 16 # Calls to get the toolchain revision are relatively slow, so do them all in a
17 # single batch to amortize python startup, etc. 17 # single batch to amortize python startup, etc.
18 revisions = exec_script("//native_client/build/get_toolchain_revision.py", 18 revisions = exec_script("//native_client/build/get_toolchain_revision.py",
19 [ 19 [
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 toolchain_tuple = "i686-nacl" 140 toolchain_tuple = "i686-nacl"
141 } 141 }
142 142
143 nacl_clang_toolchains("x64") { 143 nacl_clang_toolchains("x64") {
144 toolchain_tuple = "x86_64-nacl" 144 toolchain_tuple = "x86_64-nacl"
145 } 145 }
146 146
147 nacl_clang_toolchains("arm") { 147 nacl_clang_toolchains("arm") {
148 toolchain_tuple = "arm-nacl" 148 toolchain_tuple = "arm-nacl"
149 } 149 }
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