diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-08-30 21:37:12 -0700 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-08-30 21:47:21 -0700 |
| commit | 4dcb96e42dfa212d07c351e4a75c158a5ec95b9b (patch) | |
| tree | 2cf0a557d0bc53d1eb4ea6f194230609287f7753 /Makefile | |
| parent | 45a80fa588be78e7a7ef8bbc28ba5893b28190ac (diff) | |
| download | caffeonacl-4dcb96e42dfa212d07c351e4a75c158a5ec95b9b.tar.gz caffeonacl-4dcb96e42dfa212d07c351e4a75c158a5ec95b9b.tar.bz2 caffeonacl-4dcb96e42dfa212d07c351e4a75c158a5ec95b9b.zip | |
remove residual pthread references, but restore in build for gtest
gtest depends on pthread in Ubuntu 14.04
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -158,7 +158,7 @@ ifneq ($(CPU_ONLY), 1) LIBRARY_DIRS += $(CUDA_LIB_DIR) LIBRARIES := cudart cublas curand endif -LIBRARIES += \ +LIBRARIES += pthread \ glog gflags protobuf leveldb snappy \ lmdb \ boost_system \ @@ -277,7 +277,7 @@ LIBRARY_DIRS += $(BLAS_LIB) # Complete build flags. COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) -CXXFLAGS += -fPIC $(COMMON_FLAGS) $(WARNINGS) +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 |