BASE_CFLAGS="$BASE_CFLAGS -frandom-seed=42"
LOCAL_CFLAGS="-Wall -Wno-nullability-completeness -pthread -Iinclude/"
+HOST_OSX=false
if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+ HOST_OSX=true
+elif [ "$HOST_PLATFORM" = "host: aarch64-apple-darwin" ]; then
+ HOST_OSX=true
+fi
+
+BASE_HOST_CFLAGS="$BASE_CFLAGS"
+
+if [ "$HOST_OSX" = "true" ]; then
export MACOSX_DEPLOYMENT_TARGET=10.9
LOCAL_CFLAGS="$LOCAL_CFLAGS -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
- BASE_CFLAGS="$BASE_CFLAGS -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
+ BASE_HOST_CFLAGS="$BASE_HOST_CFLAGS -isysroot$(xcrun --show-sdk-path) -mmacosx-version-min=10.9"
# Targeting aarch64 appears to be supported only starting with Big Sur, so check it before use
- clang -o /dev/null $BASE_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14 genbindings_path_map_test_file.c &&
- export CFLAGS_aarch64_apple_darwin="$BASE_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14" ||
+ clang -o /dev/null $BASE_HOST_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14 genbindings_path_map_test_file.c &&
+ export CFLAGS_aarch64_apple_darwin="$BASE_HOST_CFLAGS --target=aarch64-apple-darwin -mcpu=apple-a14" ||
echo "WARNING: Can not build targeting aarch64-apple-darin. Upgrade to Big Sur or try upstream clang"
fi
case "$ENV_TARGET" in
"x86_64"*)
export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=sandybridge"
- export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
+ export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
;;
*)
# Assume this isn't targeted at another host and build for the host's CPU.
export RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=native"
- export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -mcpu=native"
+ export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -mcpu=native"
;;
esac
}
#endif /* _LDK_HEADER_VER */
EOF
-)" >> lightning-c-bindings/include/ldk_ver.h
+)" > lightning-c-bindings/include/ldk_ver.h
rm -rf lightning-c-bindings/src
pushd "$LIGHTNING_PATH/$1"
RUSTC_BOOTSTRAP=1 cargo rustc --profile=check --no-default-features $3 -- --cfg=c_bindings -Zunpretty=expanded > /tmp/$1-crate-source.txt
popd
- if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+ if [ "$HOST_OSX" = "true" ]; then
sed -i".original" "1i\\
pub mod $2 {
" /tmp/$1-crate-source.txt
echo "}" >> /tmp/$1-crate-source.txt
cat /tmp/$1-crate-source.txt >> /tmp/crate-source.txt
rm /tmp/$1-crate-source.txt
- if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+ if [ "$HOST_OSX" = "true" ]; then
# OSX sed is for some reason not compatible with GNU sed
sed -E -i '' 's|#*'$1' = \{ .*|'$1' = \{ path = "'"$LIGHTNING_PATH"'/'$1'", default-features = false }|' lightning-c-bindings/Cargo.toml
else
}
function drop_crate() {
- if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+ if [ "$HOST_OSX" = "true" ]; then
# OSX sed is for some reason not compatible with GNU sed
sed -E -i '' 's|'$1' = \{ (.*)|#'$1' = \{ \1|' lightning-c-bindings/Cargo.toml
else
add_crate lightning lightning --features=std
add_crate "lightning-persister" "lightning_persister"
add_crate "lightning-background-processor" "lightning_background_processor"
- add_crate "lightning-invoice" "lightning_invoice"
+ add_crate "lightning-invoice" "lightning_invoice" --features=std
CARGO_BUILD_ARGS="--features=std"
else
add_crate lightning lightning --features=no-std
drop_crate "lightning-persister"
drop_crate "lightning-background-processor"
- drop_crate "lightning-invoice"
+ add_crate "lightning-invoice" "lightning_invoice" --features=no-std
CARGO_BUILD_ARGS="--features=no-std"
fi
# cbindgen is relatively braindead when exporting typedefs -
# it happily exports all our typedefs for private types, even with the
# generics we specified in C mode! So we drop all those types manually here.
-if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+if [ "$HOST_OSX" = "true" ]; then
# OSX sed is for some reason not compatible with GNU sed
sed -i '' 's/typedef LDKnative.*Import.*LDKnative.*;//g' include/lightning.h
gcc $LOCAL_CFLAGS -fPIC -std=c99 -Wall -g -pthread -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o
if [ "$2" = "true" ]; then
g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl -lm
- if [ -x "`which valgrind`" ]; then
+ if [ -x "`which valgrind`" -a "$(uname -m)" != "ppc64le" ]; then
valgrind --error-exitcode=4 --memcheck:leak-check=full --show-leak-kinds=all ./a.out
echo
else
RUSTC_LLVM_V=$(rustc --version --verbose | grep "LLVM version" | awk '{ print substr($3, 0, 2); }')
-if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+if [ "$HOST_OSX" = "true" ]; then
# Apple is special, as always, and their versions of clang aren't
# compatible with upstream LLVM.
if [ "$(clang --version | grep 'Apple clang')" != "" ]; then
# Finally, if we're on OSX or on Linux, build the final debug binary with address sanitizer (and leave it there)
if [ "$HOST_PLATFORM" = "host: x86_64-unknown-linux-gnu" -o "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
if [ "$CLANGPP" != "" ]; then
- if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+ if [ "$HOST_OSX" = "true" ]; then
# OSX sed is for some reason not compatible with GNU sed
sed -i .bk 's/,"cdylib"]/]/g' Cargo.toml
else
# 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_$ENV_TARGET="$BASE_CFLAGS -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
+ export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
export CRATE_CC_NO_DEFAULTS=true
fi
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="$BASE_CFLAGS -target wasm32 -O1"
- RUSTFLAGS="$RUSTFLAGS --cfg=test_mod_pointers" cargo build $CARGO_BUILD_ARGS -v --target=wasm32-wasi
+ RUSTFLAGS="$BASE_RUSTFLAGS -C opt-level=1 --cfg=test_mod_pointers" cargo build $CARGO_BUILD_ARGS -v --target=wasm32-wasi
export CFLAGS_wasm32_wasi="$BASE_CFLAGS -fembed-bitcode -target wasm32 -Oz"
- RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C opt-level=z -C linker-plugin-lto -C lto" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target=wasm32-wasi
+ RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C opt-level=z -C linker-plugin-lto -C lto" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target=wasm32-wasi
else
echo "Cannot build WASM lib as clang does not seem to support the wasm32-wasi target"
fi
# packaging than simply shipping the rustup binaries (eg Debian should Just Work
# here).
LINK_ARG_FLAGS="-C link-arg=-fuse-ld=$LLD"
- if [ "$HOST_PLATFORM" = "host: x86_64-apple-darwin" ]; then
+ if [ "$HOST_OSX" = "true" ]; then
export LDK_CLANG_PATH=$(which $CLANG)
export CLANG="$(pwd)/../deterministic-build-wrappers/clang-lto-link-osx"
for ARG in "CFLAGS_aarch64_apple_darwin"; do
LINK_ARG_FLAGS="$LINK_ARG_FLAGS -C link-arg="-isysroot$(xcrun --show-sdk-path)" -C link-arg=-mmacosx-version-min=10.9"
RUSTFLAGS="$BASE_RUSTFLAGS -C target-cpu=apple-a14 -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-mcpu=apple-a14" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target aarch64-apple-darwin
fi
- export CFLAGS_$ENV_TARGET="$BASE_CFLAGS -O3 -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
+ export CFLAGS_$ENV_TARGET="$BASE_HOST_CFLAGS -O3 -fPIC -fembed-bitcode -march=sandybridge -mcpu=sandybridge -mtune=sandybridge"
# Rust doesn't recognize CFLAGS changes, so we need to clean build artifacts
cargo clean --release
CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-march=sandybridge -C link-arg=-mcpu=sandybridge -C link-arg=-mtune=sandybridge" cargo build $CARGO_BUILD_ARGS -v --release
projects / ldk-c-bindings / blobdiff