From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 14 Jul 2021 00:07:11 +0000 (+0000)
Subject: Merge pull request #36 from TheBlueMatt/main
X-Git-Tag: v0.0.99.2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=refs%2Ftags%2Fv0.0.99.2;hp=dd25b8ca96a9b8099de7d2b6983a84b063cc1052;p=ldk-c-bindings

Merge pull request #36 from TheBlueMatt/main

Fix Determinism with Newer Rustc and support additional targets (for Android)
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98f0e92..796a10c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,8 +53,7 @@ jobs:
       matrix:
         include:
           - platform: macos-10.15
-          # MacOS 11 is currently in private preview, we've applied for access
-          # - platform: macos-11
+          - platform: macos-11
     runs-on: ${{ matrix.platform }}
     env:
       TOOLCHAIN: stable
diff --git a/deterministic-build-wrappers/rustc b/deterministic-build-wrappers/rustc
index 6a18b57..947c234 100755
--- a/deterministic-build-wrappers/rustc
+++ b/deterministic-build-wrappers/rustc
@@ -10,7 +10,7 @@ IS_LIGHTNING=false
 for ((i=0; i<"${#args[@]}"; ++i)); do
     case ${args[i]} in
         --crate-name)
-			if [ "${args[i+1]}" = "lightning" -o "${args[i+1]}" = "lightning_background_processor" -o "${args[i+1]}" = "lightning_invoice" -o "${args[i+1]}" = "lightning_persister" ]; then
+			if [ "${args[i+1]}" = "lightning" -o "${args[i+1]}" = "lightning_background_processor" -o "${args[i+1]}" = "lightning_invoice" -o "${args[i+1]}" = "lightning_persister" -o "${args[i+1]}" = "ldk" ]; then
 				IS_LIGHTNING=true
 			fi
 			;;
diff --git a/genbindings.sh b/genbindings.sh
index 43ae175..cd100f6 100755
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -25,7 +25,8 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:")"
 
 # Set path to include our rustc wrapper as well as cbindgen
 export LDK_RUSTC_PATH="$(which rustc)"
-PATH="$(pwd)/deterministic-build-wrappers:$PATH:~/.cargo/bin"
+export RUSTC="$(pwd)/deterministic-build-wrappers/rustc"
+PATH="$PATH:~/.cargo/bin"
 
 # Set up CFLAGS and RUSTFLAGS vars appropriately for building libsecp256k1 and demo apps...
 BASE_CFLAGS="" # CFLAGS for libsecp256k1
@@ -396,6 +397,21 @@ if [ "$2" = "false" -a "$(rustc --print target-list | grep wasm32-wasi)" != "" ]
 	rm genbindings_wasm_test_file.c
 fi
 
+EXTRA_TARGETS=( $LDK_C_BINDINGS_EXTRA_TARGETS )
+EXTRA_CCS=( $LDK_C_BINDINGS_EXTRA_TARGET_CCS )
+
+if [ ${#EXTRA_TARGETS[@]} != ${#EXTRA_CCS[@]} ]; then
+	echo "LDK_C_BINDINGS_EXTRA_TARGETS and LDK_C_BINDINGS_EXTRA_TARGET_CCS didn't have the same number of elements!"
+	exit 1
+fi
+
+for IDX in ${!EXTRA_TARGETS[@]}; do
+	EXTRA_ENV_TARGET=$(echo "${EXTRA_TARGETS[$IDX]}" | sed 's/-/_/g')
+	export CFLAGS_$EXTRA_ENV_TARGET="$BASE_CFLAGS"
+	export CC_$EXTRA_ENV_TARGET=${EXTRA_CCS[$IDX]}
+	RUSTFLAGS="$BASE_RUSTFLAGS -C linker=${EXTRA_CCS[$IDX]}" CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release --target "${EXTRA_TARGETS[$IDX]}" -- -C lto
+done
+
 if [ "$CFLAGS_aarch64_apple_darwin" != "" ]; then
 	RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14" CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release --target aarch64-apple-darwin -- -C lto
 fi