[tor-commits] [tor-browser-build/master] Bug 30490: Adapt cbindgen for Windows 32bit usage

boklm at torproject.org boklm at torproject.org
Wed Aug 28 13:25:26 UTC 2019


commit 84d95d6d2a51d93f62e9927cfa2e63e674066c7d
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Aug 26 21:21:20 2019 +0000

    Bug 30490: Adapt cbindgen for Windows 32bit usage
---
 projects/cbindgen/build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/projects/cbindgen/build b/projects/cbindgen/build
index 429f567..402a216 100644
--- a/projects/cbindgen/build
+++ b/projects/cbindgen/build
@@ -22,8 +22,13 @@ replace-with = "vendored-sources"
 directory = "/var/tmp/build/cbindgen/vendor"
 EOF
 
-cargo build --release --frozen --target x86_64-unknown-linux-gnu
-mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %]
+[% IF ! c("var/windows-i686") -%]
+  target=x86_64
+[% ELSE -%]
+  target=i686
+[% END -%]
+cargo build --release --frozen --target $target-unknown-linux-gnu
+mv target/$target-unknown-linux-gnu/release/cbindgen $distdir/[% project %]
 
 cd $distdir
 [% c('tar', {





More information about the tor-commits mailing list