diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-05-29 19:26:26 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2025-05-29 19:26:26 +0000 |
| commit | f5ab1a1b0202e530dfd84ea789aceba24677166e (patch) | |
| tree | 2adc825fd051cc16fb7564213daf255030f6c0ce | |
| parent | 5c03b2a15a576a28eef98175a841c8bcc07b1195 (diff) | |
| download | s6-networking-f5ab1a1b0202e530dfd84ea789aceba24677166e.tar.gz | |
Correctly use pthread_lib sysdep
| -rwxr-xr-x | configure | 8 | ||||
| -rwxr-xr-x | tools/configure.template | 8 |
2 files changed, 12 insertions, 4 deletions
@@ -405,8 +405,10 @@ echo " ... *.$shlibext" if $allpic ; then tryflag CPPFLAGS_AUTO -fPIC fi -spawn_lib=$(cat $sysdeps/spawn.lib) + +pthread_lib=$(cat $sysdeps/pthread.lib) socket_lib=$(cat $sysdeps/socket.lib) +spawn_lib=$(cat $sysdeps/spawn.lib) sysclock_lib=$(cat $sysdeps/sysclock.lib) timer_lib=$(cat $sysdeps/timer.lib) util_lib=$(cat $sysdeps/util.lib) @@ -475,8 +477,10 @@ home := $home exthome := $exthome extra_includedirs :=$depincpath extra_libdirs :=$deplibpath -SPAWN_LIB := ${spawn_lib} + +PTHREAD_LIB := ${pthread_lib} SOCKET_LIB := ${socket_lib} +SPAWN_LIB := ${spawn_lib} SYSCLOCK_LIB := ${sysclock_lib} TIMER_LIB := ${timer_lib} UTIL_LIB := ${util_lib} diff --git a/tools/configure.template b/tools/configure.template index db8f59a..ac8ac86 100755 --- a/tools/configure.template +++ b/tools/configure.template @@ -389,8 +389,10 @@ echo " ... *.$shlibext" if $allpic ; then tryflag CPPFLAGS_AUTO -fPIC fi -spawn_lib=$(cat $sysdeps/spawn.lib) + +pthread_lib=$(cat $sysdeps/pthread.lib) socket_lib=$(cat $sysdeps/socket.lib) +spawn_lib=$(cat $sysdeps/spawn.lib) sysclock_lib=$(cat $sysdeps/sysclock.lib) timer_lib=$(cat $sysdeps/timer.lib) util_lib=$(cat $sysdeps/util.lib) @@ -459,8 +461,10 @@ home := $home exthome := $exthome extra_includedirs :=$depincpath extra_libdirs :=$deplibpath -SPAWN_LIB := ${spawn_lib} + +PTHREAD_LIB := ${pthread_lib} SOCKET_LIB := ${socket_lib} +SPAWN_LIB := ${spawn_lib} SYSCLOCK_LIB := ${sysclock_lib} TIMER_LIB := ${timer_lib} UTIL_LIB := ${util_lib} |