Explorar o código

Merge pull request #1859 from nicolasnoble/no-pollution-from-global-grpc

Avoid polluting our compilation with previously installed grpc.
Masood Malekghassemi %!s(int64=10) %!d(string=hai) anos
pai
achega
a6de798209
Modificáronse 2 ficheiros con 4 adicións e 0 borrados
  1. 2 0
      Makefile
  2. 2 0
      templates/Makefile.template

+ 2 - 0
Makefile

@@ -262,6 +262,8 @@ LDFLAGS += -fPIC
 endif
 endif
 
 
 INCLUDES = . include $(GENDIR)
 INCLUDES = . include $(GENDIR)
+LDFLAGS += -Llibs/$(CONFIG)
+
 ifeq ($(SYSTEM),Darwin)
 ifeq ($(SYSTEM),Darwin)
 ifneq ($(wildcard /usr/local/ssl/include),)
 ifneq ($(wildcard /usr/local/ssl/include),)
 INCLUDES += /usr/local/ssl/include
 INCLUDES += /usr/local/ssl/include

+ 2 - 0
templates/Makefile.template

@@ -276,6 +276,8 @@ LDFLAGS += -fPIC
 endif
 endif
 
 
 INCLUDES = . include $(GENDIR)
 INCLUDES = . include $(GENDIR)
+LDFLAGS += -Llibs/$(CONFIG)
+
 ifeq ($(SYSTEM),Darwin)
 ifeq ($(SYSTEM),Darwin)
 ifneq ($(wildcard /usr/local/ssl/include),)
 ifneq ($(wildcard /usr/local/ssl/include),)
 INCLUDES += /usr/local/ssl/include
 INCLUDES += /usr/local/ssl/include