From eabf50d6e1f7012528c61a975a015ff9902f0950 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 12 Jul 2021 18:46:31 +0000 Subject: [PATCH] Add extra targets env variable to build for extra targets (eg Android) --- genbindings.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 -- 2.39.5