diff options
author | Manoj Gupta <manojgupta@google.com> | 2018-05-18 11:33:19 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-18 23:07:28 -0700 |
commit | d8f10af6aeaff319f407578cdff1afd0324f5912 (patch) | |
tree | 84453e3d6b7cb02191897c49b5b0fbd46b9b5923 | |
parent | 2494ddefb17cf4f05a84412c39005b5dd9805245 (diff) | |
download | crosvm-d8f10af6aeaff319f407578cdff1afd0324f5912.tar crosvm-d8f10af6aeaff319f407578cdff1afd0324f5912.tar.gz crosvm-d8f10af6aeaff319f407578cdff1afd0324f5912.tar.bz2 crosvm-d8f10af6aeaff319f407578cdff1afd0324f5912.tar.lz crosvm-d8f10af6aeaff319f407578cdff1afd0324f5912.tar.xz crosvm-d8f10af6aeaff319f407578cdff1afd0324f5912.tar.zst crosvm-d8f10af6aeaff319f407578cdff1afd0324f5912.zip |
crosvm: Switch to cc crate.
We do not want to add dependencies on GCC. Switch to cc crate instead of gcc to honor CC setting. CQ-DEPEND=CL:1066462 BUG=chromium:814480 TEST=emerge-{eve,kevin} crosvm works. Change-Id: I4e846b2080503e5617ed66e709f7af5263c98fba Reviewed-on: https://chromium-review.googlesource.com/1066461 Commit-Ready: Manoj Gupta <manojgupta@chromium.org> Tested-by: Manoj Gupta <manojgupta@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
-rw-r--r-- | Cargo.lock | 16 | ||||
-rw-r--r-- | plugin_proto/Cargo.toml | 2 | ||||
-rw-r--r-- | sys_util/Cargo.toml | 2 | ||||
-rw-r--r-- | sys_util/build.rs | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock index 84b5594..485347f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,6 +37,11 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "cc" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "cfg-if" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -130,11 +135,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "gcc" -version = "0.3.54" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "gpu_buffer" version = "0.1.0" dependencies = [ @@ -214,7 +214,7 @@ dependencies = [ name = "plugin_proto" version = "0.14.0" dependencies = [ - "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "kvm_sys 0.1.0", "protobuf 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "protoc-rust 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -277,8 +277,8 @@ dependencies = [ name = "sys_util" version = "0.1.0" dependencies = [ + "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "data_model 0.1.0", - "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "poll_token_derive 0.1.0", "syscall_defines 0.1.0", @@ -344,10 +344,10 @@ dependencies = [ [metadata] "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" "checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d" +"checksum cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "0ebb87d1116151416c0cf66a0e3fb6430cccd120fd6300794b4dfaa050ac40ba" "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" "checksum libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "36fbc8a8929c632868295d0178dd8f63fc423fd7537ad0738372bd010b3ac9b0" "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2" "checksum protobuf 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bec26e67194b7d991908145fdf21b7cae8b08423d96dcb9e860cd31f854b9506" diff --git a/plugin_proto/Cargo.toml b/plugin_proto/Cargo.toml index e410f14..f751a80 100644 --- a/plugin_proto/Cargo.toml +++ b/plugin_proto/Cargo.toml @@ -9,5 +9,5 @@ protobuf = "*" kvm_sys = { path = "../kvm_sys" } [build-dependencies] -gcc = "=0.3.54" +cc = "=1.0.15" protoc-rust = "=1.4.3" diff --git a/sys_util/Cargo.toml b/sys_util/Cargo.toml index e336a7e..21884f8 100644 --- a/sys_util/Cargo.toml +++ b/sys_util/Cargo.toml @@ -11,4 +11,4 @@ syscall_defines = { path = "../syscall_defines" } poll_token_derive = { path = "poll_token_derive" } [build-dependencies] -gcc = "=0.3.54" +cc = "=1.0.15" diff --git a/sys_util/build.rs b/sys_util/build.rs index 58c49ca..f1fc1df 100644 --- a/sys_util/build.rs +++ b/sys_util/build.rs @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -extern crate gcc; +extern crate cc; fn main() { - gcc::Build::new() + cc::Build::new() .file("sock_ctrl_msg.c") .compile("sock_ctrl_msg"); } |