Skip to content

Commit 836b2d7

Browse files
committed
Don't pass lto arguments to Apple clang (which barfs on them)
1 parent fb114ac commit 836b2d7

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

genbindings.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ if [ "$2" = "c_sharp" ]; then
130130
else
131131
$COMPILE -o bindings.o -c -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 c_sharp/bindings.c
132132
$COMPILE $LINK -o liblightningjni_release$LDK_TARGET_SUFFIX.so -flto -O3 -Wl,--lto-O3 -Wl,-O3 -Wl,--version-script=c_sharp/libcode.version -I"$1"/lightning-c-bindings/include/ $2 bindings.o "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a -lm
133-
llvm-strip liblightningjni_release$LDK_TARGET_SUFFIX.so
133+
[ "$IS_APPLE_CLANG" != "true" ] && llvm-strip liblightningjni_release$LDK_TARGET_SUFFIX.so
134134
fi
135135
elif [ "$2" = "python" ]; then
136136
echo "Creating Python bindings..."
@@ -169,7 +169,7 @@ elif [ "$2" = "python" ]; then
169169
else
170170
$COMPILE -o bindings.o -c -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 c_sharp/bindings.c
171171
$COMPILE $LINK -o liblightningpython_release$LDK_TARGET_SUFFIX.so -Wl,--version-script=python/libcode.version -flto -O3 -Wl,--lto-O3 -Wl,-O3 -I"$1"/lightning-c-bindings/include/ $2 bindings.o "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a -lm
172-
llvm-strip liblightningpython_release$LDK_TARGET_SUFFIX.so
172+
[ "$IS_APPLE_CLANG" != "true" ] && llvm-strip liblightningpython_release$LDK_TARGET_SUFFIX.so
173173
fi
174174
elif [ "$2" = "wasm" ]; then
175175
echo "Creating TS bindings..."
@@ -273,6 +273,10 @@ else
273273
if [ "$3" = "true" ]; then
274274
$COMPILE $LINK -o liblightningjni_debug$LDK_TARGET_SUFFIX.so -g -fsanitize=address -shared-libasan -rdynamic -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c "$1"/lightning-c-bindings/target/$LDK_TARGET/debug/libldk.a -lm
275275
else
276+
[ "$IS_MAC" = "false" ] && LINK="$LINK -Wl,--no-undefined -flto -Wl,-O3 -Wl,--lto-O3"
277+
[ "$IS_MAC" = "false" ] && COMPILE="$COMPILE -flto"
278+
[ "$IS_MAC" = "true" -a "$IS_APPLE_CLANG" = "false" ] && LINK="$LINK -flto -Wl,-O3 -Wl,--lto-O3"
279+
[ "$IS_MAC" = "true" -a "$IS_APPLE_CLANG" = "false" ] && COMPILE="$COMPILE -flto"
276280
LDK_LIB="$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a
277281
if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then
278282
LINK="$LINK -Wl,--version-script=libcode.version -fuse-ld=lld"
@@ -316,9 +320,9 @@ else
316320
popd
317321
LDK_LIB="tmp/libldk.bc tmp/libldk.a"
318322
fi
319-
$COMPILE -o bindings.o -c -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c
320-
$COMPILE $LINK -o liblightningjni_release$LDK_TARGET_SUFFIX.so -flto -Wl,--lto-O3 -Wl,-O3 -O3 -I"$1"/lightning-c-bindings/include/ $2 bindings.o $LDK_LIB -lm
321-
llvm-strip liblightningjni_release$LDK_TARGET_SUFFIX.so
323+
$COMPILE -o bindings.o -c -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c
324+
$COMPILE $LINK -o liblightningjni_release$LDK_TARGET_SUFFIX.so -O3 -I"$1"/lightning-c-bindings/include/ $2 bindings.o $LDK_LIB -lm
325+
[ "$IS_APPLE_CLANG" != "true" ] && llvm-strip liblightningjni_release$LDK_TARGET_SUFFIX.so
322326
if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then
323327
GLIBC_SYMBS="$(objdump -T liblightningjni_release$LDK_TARGET_SUFFIX.so | grep GLIBC_ | grep -v "GLIBC_2\.2\." | grep -v "GLIBC_2\.3\(\.\| \)" | grep -v "GLIBC_2.\(14\|17\) " || echo)"
324328
if [ "$GLIBC_SYMBS" != "" ]; then

0 commit comments

Comments
 (0)