From: Theodore Ts'o Date: Sat, 23 Jan 2021 06:02:19 +0000 (-0500) Subject: Include PTHREAD_CFLAGS in LDFLAGS* macros X-Git-Tag: v1.46.0~28 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=26cb9f7db66feef485c377ed10ae1ec2d2003c5a;p=tools%2Fe2fsprogs.git Include PTHREAD_CFLAGS in LDFLAGS* macros PTHREAD_CFLAGS is set by AX_PTHREADS, and these flags need to be included when linking executables. Fixes: bdcd5f22203f ("Add configure and build support for the pthreads library") Signed-off-by: Theodore Ts'o --- diff --git a/MCONFIG.in b/MCONFIG.in index bd7bd30..3fede36 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -97,10 +97,10 @@ CPPFLAGS = @INCLUDES@ ALL_CFLAGS = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS) ALL_CFLAGS_SHLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_SHLIB) $(PTHREAD_CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS) ALL_CFLAGS_STLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_STLIB) $(PTHREAD_CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS) -LDFLAGS = $(SANITIZER_LDFLAGS) @LDFLAGS@ -LDFLAGS_SHLIB = $(SANITIZER_LDFLAGS) @LDFLAGS_SHLIB@ +LDFLAGS = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS@ +LDFLAGS_SHLIB = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS_SHLIB@ ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@ -LDFLAGS_STATIC = $(SANITIZER_LDFLAGS) @LDFLAGS_STATIC@ +LDFLAGS_STATIC = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS_STATIC@ BUILD_CFLAGS = $(SANITIZER_CFLAGS) @BUILD_CFLAGS@ BUILD_LDFLAGS = $(SANITIZER_LDFLAGS) @BUILD_LDFLAGS@ RDYNAMIC = @RDYNAMIC@