Merge pull request #148 from nicolasnoble/command-line-overrides

Allow to specify environment variables for search paths.
10 years ago · 11ff7e3890
parent 795879e600 0118cf0e65
commit 11ff7e3890
2 changed files with 6 additions and 6 deletions
--- a/cpp/helloworld/Makefile
+++ b/cpp/helloworld/Makefile
@ -30,9 +30,9 @@
 #

 CXX = g++
-CPPFLAGS = -I/usr/local/include -pthread
-CXXFLAGS = -std=c++11
-LDFLAGS = -L/usr/local/lib -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl
+CPPFLAGS += -I/usr/local/include -pthread
+CXXFLAGS += -std=c++11
+LDFLAGS += -L/usr/local/lib -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl
 PROTOC = protoc
 GRPC_CPP_PLUGIN = grpc_cpp_plugin
 GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`
--- a/cpp/route_guide/Makefile
+++ b/cpp/route_guide/Makefile
@ -30,9 +30,9 @@
 #

 CXX = g++
-CPPFLAGS = -I/usr/local/include -pthread
-CXXFLAGS = -std=c++11
-LDFLAGS = -L/usr/local/lib -lgpr -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl
+CPPFLAGS += -I/usr/local/include -pthread
+CXXFLAGS += -std=c++11
+LDFLAGS += -L/usr/local/lib -lgpr -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl
 PROTOC = protoc
 GRPC_CPP_PLUGIN = grpc_cpp_plugin
 GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`