diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-10-06 07:50:25 -0700 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-10-06 07:50:25 -0700 |
| commit | 5b908f3b08ed5060f05a726bb92b54cc42960ada (patch) | |
| tree | af8ed521be5e637433e3070f78e43606ea3239ce | |
| parent | 8ffb7b5adce42778b7fdbae8ee3fa4fd224b11a0 (diff) | |
| parent | c20cf21ab430e50f0d3e8d93cd42d2e930d41dd2 (diff) | |
| download | caffeonacl-5b908f3b08ed5060f05a726bb92b54cc42960ada.tar.gz caffeonacl-5b908f3b08ed5060f05a726bb92b54cc42960ada.tar.bz2 caffeonacl-5b908f3b08ed5060f05a726bb92b54cc42960ada.zip | |
Merge pull request #1179 from ducha-aiki/fix_pthread_link
[fix] put pthread last in order for gflags
| -rw-r--r-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -167,8 +167,7 @@ ifneq ($(CPU_ONLY), 1) LIBRARY_DIRS += $(CUDA_LIB_DIR) LIBRARIES := cudart cublas curand endif -LIBRARIES += pthread \ - glog gflags protobuf leveldb snappy \ +LIBRARIES += glog gflags protobuf leveldb snappy \ lmdb \ boost_system \ hdf5_hl hdf5 \ @@ -330,7 +329,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)) |