Commit 43d04ef9 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "Revert "test_libvpx: disable pthreads in gtest""

parents c259af4f f2dc3825
...@@ -683,7 +683,7 @@ process_toolchain() { ...@@ -683,7 +683,7 @@ process_toolchain() {
# x86 targets. # x86 targets.
;; ;;
*) *)
check_cxx "$@" <<EOF && soft_enable unit_tests enabled pthread_h && check_cxx "$@" <<EOF && soft_enable unit_tests
int z; int z;
EOF EOF
;; ;;
......
...@@ -442,7 +442,6 @@ else ...@@ -442,7 +442,6 @@ else
include $(SRC_PATH_BARE)/third_party/googletest/gtest.mk include $(SRC_PATH_BARE)/third_party/googletest/gtest.mk
GTEST_SRCS := $(addprefix third_party/googletest/src/,$(call enabled,GTEST_SRCS)) GTEST_SRCS := $(addprefix third_party/googletest/src/,$(call enabled,GTEST_SRCS))
GTEST_OBJS=$(call objs,$(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
$(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src/include $(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src/include
OBJS-$(BUILD_LIBVPX) += $(GTEST_OBJS) OBJS-$(BUILD_LIBVPX) += $(GTEST_OBJS)
...@@ -467,7 +466,7 @@ $(foreach bin,$(LIBVPX_TEST_BINS),\ ...@@ -467,7 +466,7 @@ $(foreach bin,$(LIBVPX_TEST_BINS),\
lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\ lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\
$(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\ $(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\
$(LIBVPX_TEST_OBJS) \ $(LIBVPX_TEST_OBJS) \
-L. -lvpx -lgtest $(extralibs) -lm)\ -L. -lvpx -lgtest -lpthread -lm)\
)))\ )))\
$(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\ $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment