diff options
| author | Keno Fischer <kfischer@college.harvard.edu> | 2015-06-29 21:52:45 +0000 |
|---|---|---|
| committer | Keno Fischer <kfischer@college.harvard.edu> | 2015-06-29 21:52:45 +0000 |
| commit | 121c1c54bf7f0fbcc78485770a04af177bb1d144 (patch) | |
| tree | 562297f1ab72d52fa6d53cf08f6018312435b0b0 | |
| parent | c349cf393925d183ed7dd8e69fa3f51169caf024 (diff) | |
| download | bcm5719-llvm-121c1c54bf7f0fbcc78485770a04af177bb1d144.tar.gz bcm5719-llvm-121c1c54bf7f0fbcc78485770a04af177bb1d144.zip | |
Add -lpthread to LLDB shared lib link line unconditionally
Usually -lpthread is included due to LLVM link options,
but when LLVM threading is disabled, this does not happen.
pthread is still needed however because LLDB uses threading
regardless of whether LLVM is built with threading support or not.
Differential Revision: http://reviews.llvm.org/D5431
llvm-svn: 241006
| -rw-r--r-- | lldb/lib/Makefile | 4 | ||||
| -rw-r--r-- | lldb/tools/lldb-mi/Makefile | 4 | ||||
| -rw-r--r-- | lldb/tools/lldb-server/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile index a58dd94453f..a31220d3015 100644 --- a/lldb/lib/Makefile +++ b/lldb/lib/Makefile @@ -188,7 +188,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) # Don't allow unresolved symbols. LLVMLibsOptions += -Wl,--no-undefined # Link in python - LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) endif @@ -200,5 +200,5 @@ ifeq ($(HOST_OS),FreeBSD) LLVMLibsOptions += -Wl,--allow-shlib-undefined # Link in python LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo \ - -ledit -lncurses -lpanel + -ledit -lncurses -lpanel -lpthread endif diff --git a/lldb/tools/lldb-mi/Makefile b/lldb/tools/lldb-mi/Makefile index da3a5b9b7cc..2a9f024db10 100644 --- a/lldb/tools/lldb-mi/Makefile +++ b/lldb/tools/lldb-mi/Makefile @@ -22,11 +22,11 @@ ifeq ($(HOST_OS),Darwin) endif ifneq (,$(filter $(HOST_OS), Linux GNU/kFreeBSD)) - LLVMLibsOptions += -Wl,-rpath,$(LibDir) + LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread endif ifeq ($(HOST_OS),FreeBSD) CPP.Flags += -I/usr/include/edit #-v - LLVMLibsOptions += -Wl,-rpath,$(LibDir) + LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread endif diff --git a/lldb/tools/lldb-server/Makefile b/lldb/tools/lldb-server/Makefile index f8e8fd7e585..24127072860 100644 --- a/lldb/tools/lldb-server/Makefile +++ b/lldb/tools/lldb-server/Makefile @@ -21,5 +21,5 @@ ifeq ($(HOST_OS),Darwin) endif ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD)) - LLVMLibsOptions += -Wl,-rpath,$(LibDir) + LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread endif |
