diff options
| author | Philip Craig <689193+philipcraig@users.noreply.github.com> | 2020-05-09 10:42:30 +0100 |
|---|---|---|
| committer | David Tolnay <dtolnay@gmail.com> | 2020-05-09 12:00:49 -0700 |
| commit | 7e14e2e6cbab8d1c556b556983e2a5e2dcbba6cc (patch) | |
| tree | 6498f63873d640cac64968f659ab09cc3b294be9 | |
| parent | e2f70fea3e769d4c135ad8808983b9939928b172 (diff) | |
| download | cxx-7e14e2e6cbab8d1c556b556983e2a5e2dcbba6cc.tar.gz | |
avoid MSVC warning via flag_if_supported
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | build.rs | 2 | ||||
| -rw-r--r-- | demo-rs/build.rs | 2 | ||||
| -rw-r--r-- | gen/build/src/lib.rs | 4 | ||||
| -rw-r--r-- | src/lib.rs | 2 | ||||
| -rw-r--r-- | tests/ffi/build.rs | 2 |
6 files changed, 7 insertions, 7 deletions
@@ -228,7 +228,7 @@ cxx-build = "0.3" fn main() { cxx_build::bridge("src/main.rs") // returns a cc::Build .file("../demo-cxx/demo.cc") - .flag("-std=c++11") + .flag_if_supported("-std=c++11") .compile("cxxbridge-demo"); println!("cargo:rerun-if-changed=src/main.rs"); @@ -3,7 +3,7 @@ fn main() { .file("src/cxx.cc") .cpp(true) .cpp_link_stdlib(None) // linked via link-cplusplus crate - .flag("-std=c++11") + .flag_if_supported("-std=c++11") .compile("cxxbridge03"); println!("cargo:rerun-if-changed=src/cxx.cc"); println!("cargo:rerun-if-changed=include/cxx.h"); diff --git a/demo-rs/build.rs b/demo-rs/build.rs index edbb2819..e4792c2a 100644 --- a/demo-rs/build.rs +++ b/demo-rs/build.rs @@ -1,7 +1,7 @@ fn main() { cxx_build::bridge("src/main.rs") .file("../demo-cxx/demo.cc") - .flag("-std=c++11") + .flag_if_supported("-std=c++11") .compile("cxxbridge-demo"); println!("cargo:rerun-if-changed=src/main.rs"); diff --git a/gen/build/src/lib.rs b/gen/build/src/lib.rs index b33e1928..14683b68 100644 --- a/gen/build/src/lib.rs +++ b/gen/build/src/lib.rs @@ -16,7 +16,7 @@ //! fn main() { //! cxx_build::bridge("src/main.rs") //! .file("../demo-cxx/demo.cc") -//! .flag("-std=c++11") +//! .flag_if_supported("-std=c++11") //! .compile("cxxbridge-demo"); //! //! println!("cargo:rerun-if-changed=src/main.rs"); @@ -83,7 +83,7 @@ pub fn bridge(rust_source_file: impl AsRef<Path>) -> cc::Build { /// let source_files = vec!["src/main.rs", "src/path/to/other.rs"]; /// cxx_build::bridges(source_files) /// .file("../demo-cxx/demo.cc") -/// .flag("-std=c++11") +/// .flag_if_supported("-std=c++11") /// .compile("cxxbridge-demo"); /// ``` pub fn bridges(rust_source_files: impl IntoIterator<Item = impl AsRef<Path>>) -> cc::Build { @@ -233,7 +233,7 @@ //! fn main() { //! cxx_build::bridge("src/main.rs") // returns a cc::Build //! .file("../demo-cxx/demo.cc") -//! .flag("-std=c++11") +//! .flag_if_supported("-std=c++11") //! .compile("cxxbridge-demo"); //! //! println!("cargo:rerun-if-changed=src/main.rs"); diff --git a/tests/ffi/build.rs b/tests/ffi/build.rs index 2c96d732..f6fa59ea 100644 --- a/tests/ffi/build.rs +++ b/tests/ffi/build.rs @@ -6,6 +6,6 @@ fn main() { let sources = vec!["lib.rs", "module.rs"]; cxx_build::bridges(sources) .file("tests.cc") - .flag("-std=c++11") + .flag_if_supported("-std=c++11") .compile("cxx-test-suite"); } |