| Index: build/toolchain/nacl/BUILD.gn
|
| diff --git a/build/toolchain/nacl/BUILD.gn b/build/toolchain/nacl/BUILD.gn
|
| index c3dcaf17c9e363dde3092257a62b72c8c544dde3..6ff9a31c02e5069eba62d165a0a6ea8efa0dae84 100644
|
| --- a/build/toolchain/nacl/BUILD.gn
|
| +++ b/build/toolchain/nacl/BUILD.gn
|
| @@ -17,55 +17,12 @@ os_toolchain_dir = "${nacl_toolchain_dir}/${current_os}_x86"
|
| # single batch to amortize python startup, etc.
|
| revisions = exec_script("//native_client/build/get_toolchain_revision.py",
|
| [
|
| - "nacl_arm_newlib",
|
| - "nacl_x86_newlib",
|
| "nacl_x86_glibc",
|
| "pnacl_newlib",
|
| ],
|
| "trim list lines")
|
| -nacl_arm_newlib_rev = revisions[0]
|
| -nacl_x86_newlib_rev = revisions[1]
|
| -nacl_x86_glibc_rev = revisions[2]
|
| -pnacl_newlib_rev = revisions[3]
|
| -
|
| -nacl_toolchain("newlib_arm") {
|
| - toolchain_package = "nacl_arm_newlib"
|
| - toolchain_revision = nacl_arm_newlib_rev
|
| - toolchain_cpu = "arm"
|
| - toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/arm-nacl-"
|
| - is_clang = false
|
| -
|
| - cc = toolprefix + "gcc"
|
| - cxx = toolprefix + "g++"
|
| - ar = toolprefix + "ar"
|
| - ld = cxx
|
| -}
|
| -
|
| -nacl_toolchain("newlib_x86") {
|
| - toolchain_package = "nacl_x86_newlib"
|
| - toolchain_revision = nacl_x86_newlib_rev
|
| - toolchain_cpu = "x86"
|
| - toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/i686-nacl-"
|
| - is_clang = false
|
| -
|
| - cc = toolprefix + "gcc"
|
| - cxx = toolprefix + "g++"
|
| - ar = toolprefix + "ar"
|
| - ld = cxx
|
| -}
|
| -
|
| -nacl_toolchain("newlib_x64") {
|
| - toolchain_package = "nacl_x86_newlib"
|
| - toolchain_revision = nacl_x86_newlib_rev
|
| - toolchain_cpu = "x64"
|
| - toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/x86_64-nacl-"
|
| - is_clang = false
|
| -
|
| - cc = toolprefix + "gcc"
|
| - cxx = toolprefix + "g++"
|
| - ar = toolprefix + "ar"
|
| - ld = cxx
|
| -}
|
| +nacl_x86_glibc_rev = revisions[0]
|
| +pnacl_newlib_rev = revisions[1]
|
|
|
| nacl_toolchain("newlib_pnacl") {
|
| toolchain_package = "pnacl_newlib"
|
|
|