Use cargo:include

Author: trevyn

.github/workflows/ci.yml

@@ -42,6 +42,9 @@ jobs:
       - run: rm openbsd-src/sys/sys/sysctl.h
       - run: rm openbsd-src/lib/libc/stdlib/malloc.c
 
+      - run: mv openbsd-src/sys/* include
+      - run: mv openbsd-src/include/* include
+
       - run: rm code.tar.gz
       - run: cargo build --target wasm32-unknown-unknown
 
@@ -70,6 +73,9 @@ jobs:
       - run: rm openbsd-src/sys/sys/sysctl.h
       - run: rm openbsd-src/lib/libc/stdlib/malloc.c
 
+      - run: mv openbsd-src/sys/* include
+      - run: mv openbsd-src/include/* include
+
       - run: rm code.tar.gz
 
       - run: cargo publish --allow-dirty --token ${{ secrets.CARGO_TOKEN }}

Cargo.toml

@@ -1,7 +1,9 @@
 [package]
 description = "The parts of OpenBSD libc that make sense on wasm32-unknown-unknown."
 edition = "2018"
+keywords = ["libc", "wasm32-unknown-unknown"]
 license = "BSD-3-Clause AND ISC AND MIT"
+links = "wasm32-unknown-unknown-openbsd-libc"
 name = "wasm32-unknown-unknown-openbsd-libc"
 repository = "https://github.com/trevyn/wasm32-unknown-unknown-openbsd-libc"
 version = "0.1.0"

build.rs

@@ -26,8 +26,6 @@ fn main() {
         "stdlib/heapsort.c",
         "stdlib/qsort.c",
         "string/bcmp.c",
-        "string/bcmp.c",
-        "string/bcmp.c",
         "string/bcopy.c",
         "string/bzero.c",
         "string/explicit_bzero.c",
@@ -84,11 +82,14 @@ fn main() {
         .collect::<Vec<_>>();
 
     cc::Build::new()
-        .include("openbsd-src/sys")
-        .include("openbsd-src/include")
         .include("include")
         .files(sources)
         .file("src/errno.c")
         .flag("-w")
         .compile("wasm32-unknown-unknown-openbsd-libc");
+
+    println!(
+        "cargo:include={}/include",
+        env::var("CARGO_MANIFEST_DIR").unwrap()
+    );
 }

src/lib.rs

@@ -1,8 +1 @@
-pub fn includes() -> Vec<impl AsRef<std::path::Path>> {
-    let dir = env!("CARGO_MANIFEST_DIR");
-    vec![
-        format!("{}/openbsd-src/sys", dir),
-        format!("{}/openbsd-src/include", dir),
-        format!("{}/include", dir),
-    ]
-}
+