Skip to content

Commit c4c3123

Browse files
committed
sys: bump tinydtls submodule, fix build script issues
1 parent ce59d7b commit c4c3123

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

tinydtls-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[package]
55
name = "tinydtls-sys"
66
description = "Raw bindings to the TinyDTLS library."
7-
version = "0.1.0+tinydtls-68f6045"
7+
version = "0.1.1+tinydtls-c7c3ca8"
88
edition = "2021"
99
links = "tinydtls"
1010
# For tinydtls, both licenses can be applied, see https://www.eclipse.org/legal/eplfaq.php#DUALLIC

tinydtls-sys/build.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() {
3939
let tinydtls_src_dir = Path::new(&out_dir).join("tinydtls");
4040

4141
// Read Makeflags into vector of strings
42-
let make_flags = std::env::var_os("CARGO_MAKEFLAGS")
42+
let _make_flags: String = std::env::var_os("CARGO_MAKEFLAGS")
4343
.unwrap()
4444
.into_string()
4545
.unwrap()
@@ -65,7 +65,7 @@ fn main() {
6565
build_config.insource(true).out_dir(&out_dir);
6666

6767
// Set Makeflags
68-
build_config.make_args(make_flags);
68+
//build_config.make_args(make_flags);
6969

7070
// Enable debug symbols if enabled in Rust.
7171
match std::env::var_os("DEBUG").unwrap().to_str().unwrap() {
@@ -76,9 +76,12 @@ fn main() {
7676
}
7777

7878
// Enable dependency features based on selected cargo features.
79-
build_config
80-
.enable("ecc", Some(if cfg!(feature = "ecc") { "yes" } else { "no" }))
81-
.enable("psk", Some(if cfg!(feature = "psk") { "yes" } else { "no" }));
79+
if !cfg!(feature = "ecc") {
80+
build_config.without("ecc", None);
81+
}
82+
if !cfg!(feature = "psk") {
83+
build_config.without("psk", None);
84+
}
8285

8386
// Run build
8487
let dst = build_config.build();

tinydtls-sys/src/tinydtls

0 commit comments

Comments
 (0)