From 7d65dcf4d9e1c11b58428bd231ef368c510d2f4a Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 18 Apr 2018 04:25:29 +0100 Subject: [PATCH] depends: Pass correct compiler, linker, and flags into googletest --- depends/packages/googletest.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/depends/packages/googletest.mk b/depends/packages/googletest.mk index b10ce89eb..ad42d5b9c 100644 --- a/depends/packages/googletest.mk +++ b/depends/packages/googletest.mk @@ -5,9 +5,14 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_download_file=release-$($(package)_version).tar.gz $(package)_sha256_hash=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 +define $(package)_set_vars +$(package)_cxxflags+=-std=c++11 +$(package)_cxxflags_linux=-fPIC +endef + define $(package)_build_cmds - $(MAKE) -C googlemock/make CXXFLAGS=-fPIC gmock.a && \ - $(MAKE) -C googletest/make CXXFLAGS=-fPIC gtest.a + $(MAKE) -C googlemock/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gmock.a && \ + $(MAKE) -C googletest/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gtest.a endef define $(package)_stage_cmds