X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.sh;h=983b0ae01ddcdd5492c02719b2714a0213dc8399;hb=63dc29a0f8e763229809c8a07b3fe63c1c7eafc9;hp=406dded6a6ff7c87960be9687ab0ea93ee6164c8;hpb=4e514def04a4aabea8261173311e6c747d4bd133;p=ldk-c-bindings diff --git a/genbindings.sh b/genbindings.sh index 406dded..983b0ae 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -9,11 +9,13 @@ if [ ! -d "$1/lightning" -o "$2" != "true" -a "$2" != "false" ]; then exit 1 fi +export LC_ALL=C + # On reasonable systems, we can use realpath here, but OSX is a diva with 20-year-old software. ORIG_PWD="$(pwd)" cd "$1" LIGHTNING_PATH="$(pwd)" -LIGHTNING_GIT="$(git describe --tag --dirty)" +LIGHTNING_GIT="$(git describe --tag --dirty --abbrev=16)" cd "$ORIG_PWD" # Generate (and reasonably test) C bindings @@ -31,7 +33,7 @@ mv lightning-c-bindings/src/bitcoin ./ git checkout lightning-c-bindings/src git checkout lightning-c-bindings/include -BINDINGS_GIT="$(git describe --tag --dirty)" +BINDINGS_GIT="$(git describe --tag --dirty --abbrev=16)" echo -e "#ifndef _LDK_HEADER_VER" > lightning-c-bindings/include/ldk_ver.h echo -e "static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {" >> lightning-c-bindings/include/ldk_ver.h echo -e "\tif (n && *s1 != *s2) return 1;" >> lightning-c-bindings/include/ldk_ver.h @@ -132,18 +134,44 @@ echo -e '\t"'"$BINDINGS_GIT"'".into()' >> lightning-c-bindings/src/version.rs echo -e '}' >> lightning-c-bindings/src/version.rs # 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" # Now cd to lightning-c-bindings, build the generated bindings, and call cbindgen to build a C header file cd lightning-c-bindings +# Set up CFLAGS and RUSTFLAGS vars appropriately for building libsecp256k1 and demo apps... +BASE_CFLAGS="" # CFLAGS for libsecp256k1 +LOCAL_CFLAGS="" # CFLAGS for demo apps +BASE_RUSTFLAGS="" # RUSTFLAGS + # Remap paths so that our builds are deterministic -export RUSTFLAGS="--remap-path-prefix $LIGHTNING_PATH=rust-lightning --remap-path-prefix $(pwd)=ldk-c-bindings --remap-path-prefix $HOME/.cargo= -C target-cpu=generic" +export RUSTFLAGS="--remap-path-prefix $LIGHTNING_PATH=rust-lightning --remap-path-prefix $(pwd)=ldk-c-bindings --remap-path-prefix $HOME/.cargo= -C target-cpu=sandybridge" # If the C compiler supports it, also set -ffile-prefix-map echo "int main() {}" > genbindings_path_map_test_file.c clang -o /dev/null -ffile-prefix-map=$HOME/.cargo= genbindings_path_map_test_file.c > /dev/null 2>&1 && -# Now that we've done our last non-LTO build, turn on LTO in CFLAGS as well -export CFLAGS="-ffile-prefix-map=$HOME/.cargo=" +export BASE_CFLAGS="-ffile-prefix-map=$HOME/.cargo=" + +BASE_CFLAGS="$BASE_CFLAGS -frandom-seed=42" +LOCAL_CFLAGS="-Wall -Wno-nullability-completeness -pthread -Iinclude/" + +if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then + LOCAL_CFLAGS="$LOCAL_CFLAGS -isysroot$(xcrun --show-sdk-path)" + BASE_CFLAGS="$BASE_CFLAGS -isysroot$(xcrun --show-sdk-path)" +fi + +ENV_TARGET=$(rustc --version --verbose | grep host | awk '{ print $2 }' | sed 's/-/_/g') +case "$ENV_TARGET" in + "x86_64"*) + export RUSTFLAGS="$RUSTFLAGS -C target-cpu=sandybridge" + export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -march=sandybridge -mcpu=sandybridge -mtune=sandybridge" + ;; + *) + # Assume this isn't targeted at another host and build for the host's CPU. + export RUSTFLAGS="$RUSTFLAGS -C target-cpu=native" + export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -mcpu=native" + ;; +esac rm genbindings_path_map_test_file.c cargo build @@ -168,9 +196,6 @@ else fi # Finally, sanity-check the generated C and C++ bindings with demo apps: - -LOCAL_CFLAGS="-Wall -Wno-nullability-completeness -pthread -Iinclude/" - # Naively run the C demo app: gcc $LOCAL_CFLAGS -Wall -g -pthread demo.c target/debug/libldk.a -ldl ./a.out @@ -229,23 +254,13 @@ fi RUSTC_LLVM_V=$(rustc --version --verbose | grep "LLVM version" | awk '{ print substr($3, 0, 2); }' | tr -d '.') if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then - # Apple is special, as always, and decided that they must ensure that there is no way to identify - # the LLVM version used. Why? Just to make your life hard. - # This list is taken from https://en.wikipedia.org/wiki/Xcode - APPLE_CLANG_V=$(clang --version | head -n1 | awk '{ print $4 }') - if [ "$APPLE_CLANG_V" = "10.0.0" ]; then - CLANG_LLVM_V="6" - elif [ "$APPLE_CLANG_V" = "10.0.1" ]; then - CLANG_LLVM_V="7" - elif [ "$APPLE_CLANG_V" = "11.0.0" ]; then - CLANG_LLVM_V="8" - elif [ "$APPLE_CLANG_V" = "11.0.3" ]; then - CLANG_LLVM_V="9" - elif [ "$APPLE_CLANG_V" = "12.0.0" ]; then - CLANG_LLVM_V="10" - else - echo "WARNING: Unable to identify Apple clang LLVM version" + # Apple is special, as always, and their versions of clang aren't + # compatible with upstream LLVM. + if [ "$(clang --version | grep 'Apple clang')" != "" ]; then + echo "Apple clang isn't compatible with upstream clang, install upstream clang" CLANG_LLVM_V="0" + else + CLANG_LLVM_V=$(clang --version | head -n1 | awk '{ print substr($4, 0, 2); }' | tr -d '.') fi else CLANG_LLVM_V=$(clang --version | head -n1 | awk '{ print substr($4, 0, 2); }' | tr -d '.') @@ -256,7 +271,12 @@ if [ "$CLANG_LLVM_V" = "$RUSTC_LLVM_V" ]; then CLANGPP=clang++ elif [ "$(which clang-$RUSTC_LLVM_V)" != "" ]; then CLANG="$(which clang-$RUSTC_LLVM_V)" - CLANGPP="$(which clang++-$RUSTC_LLVM_V)" + CLANGPP="$(which clang++-$RUSTC_LLVM_V || echo clang++)" + if [ "$($CLANG --version)" != "$($CLANGPP --version)" ]; then + echo "$CLANG and $CLANGPP are not the same version of clang!" + unset CLANG + unset CLANGPP + fi fi if [ "$CLANG" != "" -a "$CLANGPP" = "" ]; then @@ -307,7 +327,7 @@ if [ "$HOST_PLATFORM" != "host: x86_64-apple-darwin" -a "$CLANGPP" != "" ]; then # The cc-rs crate tries to force -fdata-sections and -ffunction-sections on, which # breaks -fembed-bitcode, so we turn off cc-rs' default flags and specify exactly # what we want here. - export CFLAGS="$CFLAGS -fPIC -fembed-bitcode" + export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -fPIC -fembed-bitcode -march=sandybridge" export CRATE_CC_NO_DEFAULTS=true fi @@ -316,9 +336,9 @@ if [ "$2" = "false" -a "$(rustc --print target-list | grep wasm32-wasi)" != "" ] echo "int main() {}" > genbindings_wasm_test_file.c if clang -nostdlib -o /dev/null --target=wasm32-wasi -Wl,--no-entry genbindings_wasm_test_file.c > /dev/null 2>&1; then # And if it does, build a WASM binary without capturing errors - export CFLAGS_wasm32_wasi="-target wasm32" + export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32" cargo rustc -v --target=wasm32-wasi - export CFLAGS_wasm32_wasi="-target wasm32 -Os" + export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32 -Os" CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release --target=wasm32-wasi -- -C embed-bitcode=yes -C opt-level=s -C linker-plugin-lto -C lto else echo "Cannot build WASM lib as clang does not seem to support the wasm32-wasi target" @@ -332,7 +352,7 @@ if [ "$HOST_PLATFORM" != "host: x86_64-apple-darwin" -a "$CLANGPP" != "" ]; then # or Ubuntu packages). This should work fine on Distros which do more involved # packaging than simply shipping the rustup binaries (eg Debian should Just Work # here). - export CFLAGS="$CFLAGS -O3" + export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -O3 -fPIC -fembed-bitcode -march=sandybridge" # Rust doesn't recognize CFLAGS changes, so we need to clean build artifacts cargo clean --release CARGO_PROFILE_RELEASE_LTO=true cargo rustc -v --release -- -C linker-plugin-lto -C lto -C link-arg=-fuse-ld=lld