From 6d0afbdbf3e271e248e2c76aa60e00740e5c7ee6 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Fri, 1 May 2020 00:28:28 +0200 Subject: [PATCH] Revert "client Makefile: link with pthread only if needed" This reverts commit 43b69bd4e46dd8f08889275f5cce4377b8bfa44c. --- client/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/Makefile b/client/Makefile index 10cf51749..e8358757e 100644 --- a/client/Makefile +++ b/client/Makefile @@ -22,17 +22,13 @@ vpath %.dic dictionaries OBJDIR = obj LDLIBS ?= -L/usr/local/lib -LDLIBS += -lreadline -lm +LDLIBS += -lreadline -lpthread -lm -# MacOSX /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld +# RPi Zero gcc requires -latomic +# but MacOSX /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld # doesn't recognize option --as-needed ifneq ($(platform),Darwin) -# RPi Zero gcc requires -latomic LDLIBS += -Wl,--as-needed -latomic -Wl,--no-as-needed -# Android Termux doesn't have pthread - LDLIBS += -Wl,--as-needed -lpthread -Wl,--no-as-needed -else - LDLIBS += -lpthread endif # local libraries