abc-sys: Fix binding generation on mac os

Co-authored-by: Emily Schmidt <[email protected]>
YosysHQ · Sep 8, 2024 · a786298 · a786298
1 parent 6920c04
commit a786298
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/abc-sys/build.rs b/abc-sys/build.rs
@@ -1073,7 +1073,7 @@ fn main() {
 
     let mut cc_c = cc.clone();
     let mut cc_cpp = cc;
-    cc_cpp.cpp(true);
+    cc_cpp.cpp(true).std("c++17");
 
     cc_cpp.files(SRC_FILES.iter().filter(|&f| f.ends_with(".cpp")));
     cc_c.files(SRC_FILES.iter().filter(|&f| f.ends_with(".c")));

diff --git a/abc-sys/codegen.sh b/abc-sys/codegen.sh
@@ -7,8 +7,8 @@ echo "cargo::rerun-if-changed=codegen.sh"
 
 if [ -f src/generated/bindings.d -a -f src/generated/bindings.sha256 ]; then
     for file in $(cat src/generated/bindings.d); do
-        openssl dgst -sha256 $file
-    done | cmp src/generated/bindings.sha256 && {
+        openssl sha256 $file
+    done | cmp src/generated/bindings.sha256 - && {
         for file in $(cat src/generated/bindings.d); do
             echo "cargo::rerun-if-changed=$file"
         done
@@ -34,13 +34,15 @@ bindgen \
     -- -I abc/src -D ABC_USE_STDINT_H \
     > src/generated/bindings.rs
 
-sed -Ee 's!(^.*?:| /[^ ]+)!!g' -i src/generated/bindings.d
+mv src/generated/bindings.d src/generated/bindings.d.tmp
+sed -Ee 's!(^[^:]*:| /[^ ]+)!!g' < src/generated/bindings.d.tmp > src/generated/bindings.d
+rm src/generated/bindings.d.tmp
 
 echo >> src/generated/bindings.d
 echo "codegen.sh" >> src/generated/bindings.d
 
 for file in $(cat src/generated/bindings.d); do
-    openssl dgst -sha256 $file
+    openssl sha256 $file
 done > src/generated/bindings.sha256
 for file in $(cat src/generated/bindings.d); do
     echo "cargo::rerun-if-changed=$file"

diff --git a/abc-sys/src/generated/bindings.sha256 b/abc-sys/src/generated/bindings.sha256
@@ -41,4 +41,4 @@ SHA2-256(abc/src/sat/bsat/satVec.h)= b31da05c59a60a614e06ebe88ff0ba9cb8d52f53187
 SHA2-256(abc/src/sat/cnf/cnf.h)= 8f6b883dca52def0034ccf763a484fc07720d04cfcf82f4f17683b4b4e9c39d4
 SHA2-256(src/bindings.h)= 4905133d7387b06ae69e002e4b5fc8aef1e1e22768c942d4db9cf212fc699a32
 SHA2-256(src/glucose2_bindings.h)= d942dee7ae93c121542ea628d7692cd64e3a73f3f582560c9a8a43c2d11e3058
-SHA2-256(codegen.sh)= cb0254ed327b2e353f817e66233caffcdce033870cce53f2b01c323ce5b9e12b
+SHA2-256(codegen.sh)= c2b48a38c9342424fe7e566fdca0cb03b1374aca63fa1de257867ba8957b166e