ref: 43d04ef93b2ec948992db2c9a137e2af681f4fb6
parent: c259af4f734681e857847129f1eef56bd7c39b2a
parent: f2dc38256d44fcb60ef28779c073a75aefc3fd4d
author: James Zern <jzern@google.com>
date: Thu Jun 20 11:02:27 EDT 2013
Merge "Revert "test_libvpx: disable pthreads in gtest""
--- a/configure
+++ b/configure
@@ -683,7 +683,7 @@
# x86 targets.
;;
*)
- check_cxx "$@" <<EOF && soft_enable unit_tests
+ enabled pthread_h && check_cxx "$@" <<EOF && soft_enable unit_tests
int z;
EOF
;;
--- a/libs.mk
+++ b/libs.mk
@@ -442,7 +442,6 @@
include $(SRC_PATH_BARE)/third_party/googletest/gtest.mk
GTEST_SRCS := $(addprefix third_party/googletest/src/,$(call enabled,GTEST_SRCS))
GTEST_OBJS=$(call objs,$(GTEST_SRCS))
-$(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -DGTEST_HAS_PTHREAD=0
$(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src
$(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src/include
OBJS-$(BUILD_LIBVPX) += $(GTEST_OBJS)
@@ -467,7 +466,7 @@
lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\
$(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\
$(LIBVPX_TEST_OBJS) \
- -L. -lvpx -lgtest $(extralibs) -lm)\
+ -L. -lvpx -lgtest -lpthread -lm)\
)))\
$(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\