summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmytro Mishkin <ducha.aiki@gmail.com>2014-10-06 10:32:47 +0300
committerDmytro Mishkin <ducha.aiki@gmail.com>2014-10-06 10:32:47 +0300
commitc20cf21ab430e50f0d3e8d93cd42d2e930d41dd2 (patch)
treeae640319cab7799d5068ca84fbf55ddbe136a7f0
parentdb67d52dcc3567ce636e472fa4554ce43878c84c (diff)
downloadcaffeonacl-c20cf21ab430e50f0d3e8d93cd42d2e930d41dd2.tar.gz
caffeonacl-c20cf21ab430e50f0d3e8d93cd42d2e930d41dd2.tar.bz2
caffeonacl-c20cf21ab430e50f0d3e8d93cd42d2e930d41dd2.zip
change -lpthread to -pthread in linking
Compilation flags is already there
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 929f8d5c..f49ea564 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,7 @@ LIBRARIES += glog gflags protobuf leveldb snappy \
lmdb \
boost_system \
hdf5_hl hdf5 \
- opencv_core opencv_highgui opencv_imgproc pthread
+ opencv_core opencv_highgui opencv_imgproc
PYTHON_LIBRARIES := boost_python python2.7
WARNINGS := -Wall -Wno-sign-compare
@@ -314,7 +314,7 @@ CXXFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS)
NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
# mex may invoke an older gcc that is too liberal with -Wuninitalized
MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
-LINKFLAGS += -fPIC $(COMMON_FLAGS) $(WARNINGS)
+LINKFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS)
LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \
$(foreach library,$(LIBRARIES),-l$(library))
PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library))