topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2024-10-06 16:43:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not link against cxxbridge1

Browse Source 
This will be handled in the parent project
This commit is contained in:
topjohnwu 2022-06-30 00:43:31 -07:00
parent a73ec2470e
commit 8b34a83f11
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -10,7 +10,7 @@ exclude = ["/demo", "/gen", "/syntax", "/third-party", "/tools/buck/prelude"]
homepage = "https://cxx.rs"
keywords = ["ffi", "c++"]
license = "MIT OR Apache-2.0"
links = "cxxbridge1"
# links = "cxxbridge1"
repository = "https://github.com/dtolnay/cxx"
rust-version = "1.67"
@ -24,7 +24,7 @@ std = ["alloc"]
[dependencies]
cxxbridge-macro = { version = "=1.0.124", path = "macro" }
link-cplusplus = "1.0.9"
# link-cplusplus = "1.0.9"
[build-dependencies]
cc = "1.0.83"

6
build.rs
View File

@ -2,11 +2,11 @@
#![allow(unexpected_cfgs)]
use std::env;
use std::path::{Path, PathBuf};
// use std::path::{Path, PathBuf};
use std::process::Command;
fn main() {
let manifest_dir_opt = env::var_os("CARGO_MANIFEST_DIR").map(PathBuf::from);
/* let manifest_dir_opt = env::var_os("CARGO_MANIFEST_DIR").map(PathBuf::from);
let manifest_dir = manifest_dir_opt.as_deref().unwrap_or(Path::new(""));
cc::Build::new()
@ -24,7 +24,7 @@ fn main() {
if let Some(manifest_dir) = &manifest_dir_opt {
let cxx_h = manifest_dir.join("include").join("cxx.h");
println!("cargo:HEADER={}", cxx_h.to_string_lossy());
}
} */
if let Some(rustc) = rustc_version() {
if rustc.minor >= 80 {