| OLD | NEW |
| 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 import("//build/config/nacl/nacl.gni") |
| 9 os_toolchain_dir = "${nacl_toolchain_dir}/${current_os}_x86" | |
| 10 | 9 |
| 11 # Add the toolchain revision as a preprocessor define so that sources are | 10 # Add the toolchain revision as a preprocessor define so that sources are |
| 12 # rebuilt when a toolchain is updated. | 11 # rebuilt when a toolchain is updated. |
| 13 # Idea we could use the toolchain deps feature, but currently that feature is | 12 # Idea we could use the toolchain deps feature, but currently that feature is |
| 14 # bugged and does not trigger a rebuild. | 13 # bugged and does not trigger a rebuild. |
| 15 # https://code.google.com/p/chromium/issues/detail?id=431880 | 14 # 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 | 15 # Calls to get the toolchain revision are relatively slow, so do them all in a |
| 17 # single batch to amortize python startup, etc. | 16 # single batch to amortize python startup, etc. |
| 18 revisions = exec_script("//native_client/build/get_toolchain_revision.py", | 17 revisions = exec_script("//native_client/build/get_toolchain_revision.py", |
| 19 [ | 18 [ |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 | 199 |
| 201 # Some IRT implementations (notably, Chromium's) contain C++ code, | 200 # Some IRT implementations (notably, Chromium's) contain C++ code, |
| 202 # so we need to link w/ the C++ linker. | 201 # so we need to link w/ the C++ linker. |
| 203 ld = "${python_path} ${link_irt} --tls-edit=tls_edit --link-cmd=${cxx} --reade
lf-cmd=${readelf}" | 202 ld = "${python_path} ${link_irt} --tls-edit=tls_edit --link-cmd=${cxx} --reade
lf-cmd=${readelf}" |
| 204 | 203 |
| 205 # TODO(ncbray): depend on link script | 204 # TODO(ncbray): depend on link script |
| 206 deps = [ | 205 deps = [ |
| 207 "//native_client/src/tools/tls_edit:tls_edit($host_toolchain)", | 206 "//native_client/src/tools/tls_edit:tls_edit($host_toolchain)", |
| 208 ] | 207 ] |
| 209 } | 208 } |
| OLD | NEW |