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 98f0e92bb269d40fe234838080112da5d30617eb..796a10c99f6bb9a27df60b1040396ee7e535af14 100644 (file)
--- 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 6a18b572101a2c72119b6876db86440e05b0d5a6..947c2345b86a1973f562c46c5be2e71d5bfeb42d 100755 (executable)
--- 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 43ae175cac987b0bd6242ecad733358fde38da2a..cd100f6a86f1fd00d81de86bc3a5df28435f910d 100755 (executable)
--- 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