ref: 90a9900abb79fabfd44189a959d14ca677c2777a
parent: 2319b7aaf17b7efe143862bf0569fe8c9efd9d1f
author: James Zern <jzern@google.com>
date: Tue Jun 18 15:19:20 EDT 2013
test_libvpx: disable pthreads in gtest currently threading is internal to libvpx so thread safety is unneeded in libgtest -- visual studio builds already operate in this way as they do not have pthread.h available by default. this removes an unconditional link to libpthread using $(extralibs) should libvpx require it. Change-Id: Ieae1d693406653a54b54fba818c598836797d33b
--- a/configure
+++ b/configure
@@ -683,7 +683,7 @@
# x86 targets.
;;
*)
- enabled pthread_h && check_cxx "$@" <<EOF && soft_enable unit_tests
+ check_cxx "$@" <<EOF && soft_enable unit_tests
int z;
EOF
;;
--- a/libs.mk
+++ b/libs.mk
@@ -442,6 +442,7 @@
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)
@@ -466,7 +467,7 @@
lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\
$(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\
$(LIBVPX_TEST_OBJS) \
- -L. -lvpx -lgtest -lpthread -lm)\
+ -L. -lvpx -lgtest $(extralibs) -lm)\
)))\
$(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\