Commit 69f7efafe18d083fc76fc5925404e39f7955f2fa
2023-08-20T13:38:37
fix -ldl
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
diff --git a/c3s/configure b/c3s/configure
index e9f94bb..052cc3e 100755
--- a/c3s/configure
+++ b/c3s/configure
@@ -51,13 +51,13 @@ LIBS="${LIBS:=-lm}"
# Common config for all targets
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
CPPFLAGS="$CPPFLAGS -I../libffi/include"
-LIBS="$LIBS ../libffi/.libs/libffi.la -pthread"
config_asan
config_gnu
pkg_config libbsd-overlay
pkg_config libmd
config_lib libmd -lmd
config_lib dl -ldl
+LIBS="$LIBS ../libffi/.libs/libffi.la -pthread"
# Asan config
CFLAGS_ASAN="$CFLAGS -fsanitize=address -O1 -fno-omit-frame-pointer -g"
diff --git a/config.subr b/config.subr
index 0397ff0..c5dcc3e 100644
--- a/config.subr
+++ b/config.subr
@@ -99,7 +99,7 @@ config_lib() {
echo "/* generated by configure */" > "$OUT"
echo "int main () { return 0; }" >> "$OUT"
LIBS="${LIBS} $@"
- if ${CC} ${CPPFLAGS} ${CFLAGS} "$OUT" ${LIBS} -o /dev/null 2>/dev/null; then
+ if ${CC} ${CPPFLAGS} ${CFLAGS} "$OUT" ${LIBS} -o /dev/null; then
:
else
LIBS="${LIBS_SAVE}"
diff --git a/ic3/configure b/ic3/configure
index ba97dfd..a6eaa64 100755
--- a/ic3/configure
+++ b/ic3/configure
@@ -51,13 +51,13 @@ LIBS="${LIBS:=-lm}"
# Common config for all targets
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
CPPFLAGS="$CPPFLAGS -I../libffi/include"
-LIBS="$LIBS ../libffi/libffi.la -pthread"
config_asan
config_gnu
pkg_config libbsd-overlay
pkg_config libmd
config_lib libmd -lmd
config_lib dl -ldl
+LIBS="$LIBS ../libffi/libffi.la -pthread"
# Asan config
CFLAGS_ASAN="$CFLAGS -fsanitize=address -O1 -fno-omit-frame-pointer -g"
diff --git a/libc3/configure b/libc3/configure
index bdc6b71..007e4e1 100755
--- a/libc3/configure
+++ b/libc3/configure
@@ -40,7 +40,6 @@ LIBS="${LIBS} -lm -pthread -rpath ${PREFIX}/lib"
# Common config for all targets
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic -fPIC"
CPPFLAGS="$CPPFLAGS -I../libffi/include"
-LIBS="../libffi/libffi.la"
config_asan
config_gnu
pkg_config libbsd-overlay
@@ -51,6 +50,7 @@ config_include sha_h sys/types.h sha.h HAVE_SHA_H
config_include sha1_h sys/types.h sha1.h HAVE_SHA1_H
config_define PREFIX "\"${PREFIX}\""
update_config_h
+LIBS="$LIBS ../libffi/libffi.la"
if ! [ -f ../ucd2c/ucd.c ]; then
touch ../ucd2c/ucd.c
diff --git a/libffi b/libffi
index 441a013..2574138 160000
--- a/libffi
+++ b/libffi
@@ -1 +1 @@
-Subproject commit 441a01363cb0025913a6284972cf9eb266443ebc
+Subproject commit 25741389112b056edab0203580e323ae9f7b1c10
diff --git a/test/configure b/test/configure
index b8f3eed..924461a 100755
--- a/test/configure
+++ b/test/configure
@@ -51,13 +51,13 @@ LIBS="${LIBS:=} -lm"
# Common config for all targets
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
CPPFLAGS="$CPPFLAGS -I../libffi/include"
-LIBS="$LIBS ../libffi/libffi.la -pthread"
config_asan
config_gnu
pkg_config libbsd-overlay
pkg_config libmd
config_lib libmd -lmd
config_lib dl -ldl
+LIBS="$LIBS ../libffi/libffi.la -pthread"
# Asan config
CFLAGS_ASAN="$CFLAGS -fsanitize=address -O1 -fno-omit-frame-pointer -g"