Merge pull request #8372 from Rmys/master

cbindgen
2020-04-07 09:49:20 +03:00
parent 7098ec5f36 33252647a1
commit 9f657babe5
2 changed files with 18 additions and 0 deletions
@@ -0,0 +1,15 @@
+diff -Nuar a/tests/tests.rs b/tests/tests.rs
+--- a/tests/tests.rs	2020-04-05 00:32:40.000000000 +0300
+++ b/tests/tests.rs	2020-04-07 09:43:23.472782274 +0300
+@@ -74,7 +74,10 @@
+         Language::C => env::var("CC").unwrap_or_else(|_| "gcc".to_owned()),
+     };
+ 
+-    let mut object = tmp_dir.join(cbindgen_output);
+    let file_name = cbindgen_output
+        .file_name()
+        .expect("cbindgen output should be a file");
+    let mut object = tmp_dir.join(file_name);
+     object.set_extension("o");
+ 
+     let mut command = Command::new(cc); 
@@ -17,6 +17,9 @@
            <Dependency versionFrom="1.42.0">rust</Dependency>
            <Dependency>llvm</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">test.patch</Patch>
+        </Patches>
    </Source>

    <Package>