Commitd8f4dbe

authored

Merge pull request#80 from shahn/friendly_non_linux_compilation

Friendly non linux compilation error

2 parents32fa1af +eb55dab commitd8f4dbeCopy full SHA for d8f4dbe

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,17 +39,15 @@ enumerate = ["dep:libudev"]`
`39`	`39`	`embedded-can ="0.4"`
`40`	`40`	`nb ="1"`
`41`	`41`	`log ="0.4"`
`42`		`-byte_conv ="0.1.1"`
`43`	`42`	`hex ="0.4"`
`44`	`43`	`itertools ="0.13"`
`45`	`44`	`libc ="0.2"`
`46`	`45`	`nix = {version="0.29",features = ["poll","process","net"] }`
`47`	`46`	`bitflags ="2.6"`
`48`		`-thiserror ="1.0"`
	`47`	`+thiserror ="2"`
`49`	`48`	`socket2 = {version ="0.5",features = ["all"] }`
`50`	`49`	`clap = {version ="3.2",optional =true }`
`51`	`50`	`anyhow = {version ="1",optional =true }`
`52`		`-neli = {version ="0.6",optional =true }`
`53`	`51`	`tokio = {version ="1",features = ["net"],optional =true }`
`54`	`52`	`mio = {version ="1",features = ["os-ext"],optional =true }`
`55`	`53`	`futures = {version ="0.3",optional =true }`
`@@ -58,6 +56,12 @@ smol = { version = "1.3", optional = true }`
`58`	`56`	`async-std = {version ="1.12",optional =true }`
`59`	`57`	`libudev = {version ="0.3",optional =true }`
`60`	`58`
	`59`	`+# This hack avoids building neli on non-linux platforms, which`
	`60`	`+# avoids a ton of compile errors. Worthwhile together with the`
	`61`	`+# build.rs script to error early when building for non-linux`
	`62`	`+[target.'cfg(target_os="linux")'.dependencies]`
	`63`	`+neli = {version ="0.6",optional =true }`
	`64`	`+`
`61`	`65`	`[dev-dependencies]`
`62`	`66`	`anyhow ="1.0"`
`63`	`67`	`ctrlc ="3.2.2"`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,7 @@`
	`1`	`+fnmain() ->Result<(),Box<dyn std::error::Error>>{`
	`2`	`+println!("cargo:rerun-if-changed=build.rs");`
	`3`	`+match std::env::var("CARGO_CFG_TARGET_OS"){`
	`4`	`+Ok(val)if val =="linux" =>Ok(()),`
	`5`	`+ _ =>Err("Building for anything but Linux is not supported by socketcan".into()),`
	`6`	`+}`
	`7`	`+}`

Comments

(0)