From 9908d7bdae69a91d82decd040f082fbe489b0750 Mon Sep 17 00:00:00 2001 From: xxlight Date: Mon, 8 May 2023 14:13:54 +0800 Subject: [PATCH] cxx and bindgen tests Issue: https://gitee.com/openharmony/third_party_rust_cxx/issues/I717LF Signed-off-by: xxlight Change-Id: I46fefbe0979305aca135968cf200598ceb7b8f92 --- BUILD.gn | 5 +---- build.rs | 17 ----------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 8ab96839..a8954ef3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -24,10 +24,7 @@ ohos_cargo_crate("lib") { cargo_pkg_authors = "David Tolnay " cargo_pkg_name = "cxx" cargo_pkg_description = "Safe interop between Rust and C++" - deps = [ - "//third_party/rust/crates/cxx/macro:lib(${host_toolchain})", - "//third_party/rust/crates/link-cplusplus:lib", - ] + deps = [ "//third_party/rust/crates/cxx/macro:lib(${host_toolchain})" ] features = [ "alloc", "std", diff --git a/build.rs b/build.rs index 9158b1c8..b51536f7 100644 --- a/build.rs +++ b/build.rs @@ -3,23 +3,6 @@ use std::path::Path; use std::process::Command; fn main() { - cc::Build::new() - .file("src/cxx.cc") - .cpp(true) - .cpp_link_stdlib(None) // linked via link-cplusplus crate - .flag_if_supported(cxxbridge_flags::STD) - .warnings_into_errors(cfg!(deny_warnings)) - .compile("cxxbridge1"); - - println!("cargo:rerun-if-changed=src/cxx.cc"); - println!("cargo:rerun-if-changed=include/cxx.h"); - println!("cargo:rustc-cfg=built_with_cargo"); - - if let Some(manifest_dir) = env::var_os("CARGO_MANIFEST_DIR") { - let cxx_h = Path::new(&manifest_dir).join("include").join("cxx.h"); - println!("cargo:HEADER={}", cxx_h.to_string_lossy()); - } - if let Some(rustc) = rustc_version() { if rustc.minor < 60 { println!("cargo:warning=The cxx crate requires a rustc version 1.60.0 or newer."); -- Gitee