commit ea6206d69c4cc53c349041a1658b54277aee66c2
author Allen Webb <allenwebb@google.com> Fri Jun 14 13:56:03 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 14 13:56:03 2019 -0700
tree 933ded79d459dafa259e7ddba9e8cb6e5d9bd3ae
parent 1933e5fac40cb015ad88456f1575c0da4dd4fb98
parent f8c21ea6676eb6f366562cb9dff8cb30c420fd00

Makefile: Workaround gtest-config not being installed.
am: f8c21ea667

Change-Id: Ie551347ece63095ebf6774740f8d8f17877b7ba3

Makefile

diff --git a/Makefile b/Makefile
index b2c5569..4bfa820 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,10 @@
 GTEST_CXXFLAGS := -std=gnu++14
 GTEST_LIBS := gtest.a
 else
-GTEST_CXXFLAGS := $(shell gtest-config --cxxflags)
-GTEST_LIBS := $(shell gtest-config --libs)
+GTEST_CXXFLAGS := $(shell gtest-config --cxxflags 2>/dev/null || \
+  echo "-pthread")
+GTEST_LIBS := $(shell gtest-config --libs 2>/dev/null || \
+  echo "-lgtest -pthread -lpthread")
 endif
 
 CORE_OBJECT_FILES := libminijail.o syscall_filter.o signal_handler.o \