Fix makefile, codegen bugs

pull/4589/head
Craig Tiller 9 years ago
parent 47c50cc4d3
commit ea21ca234c
  1. 5
      Makefile
  2. 5
      templates/Makefile.template
  3. 3
      templates/test/core/surface/public_headers_must_be_c89.c.template
  4. 2
      test/core/surface/public_headers_must_be_c89.c

@ -11459,7 +11459,10 @@ $(BINDIR)/$(CONFIG)/public_headers_must_be_c89: $(PUBLIC_HEADERS_MUST_BE_C89_OBJ
endif
$(OBJDIR)/$(CONFIG)/test/core/surface/public_headers_must_be_c89.o: $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(OBJDIR)/$(CONFIG)/test/core/surface/public_headers_must_be_c89.o: CFLAGS := $(CFLAGS) -std=c89
$(OBJDIR)/$(CONFIG)/test/core/surface/public_headers_must_be_c89.o : test/core/surface/public_headers_must_be_c89.c
$(E) "[C] Compiling $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -std=c89 -pedantic -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
deps_public_headers_must_be_c89: $(PUBLIC_HEADERS_MUST_BE_C89_OBJS:.o=.dep)

@ -1860,7 +1860,10 @@
% if tgt.language == 'c89':
% for src in tgt.src:
$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: CFLAGS := <%text>$(CFLAGS)</%text> -std=c89
$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o : ${src}
$(E) "[C] Compiling $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -std=c89 -pedantic -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
% endfor
% endif

@ -35,7 +35,8 @@
<%
def is_platform_header(hdr):
for platform_identifier in ['_gcc', '_win32', '_pthread', '_zookeeper']:
for platform_identifier in ['_gcc', '_win32', '_pthread',
'_zookeeper', '_msvc', '_posix']:
if platform_identifier in hdr:
return True
return False

@ -53,11 +53,9 @@
#include <grpc/support/subprocess.h>
#include <grpc/support/sync.h>
#include <grpc/support/sync_generic.h>
#include <grpc/support/sync_posix.h>
#include <grpc/support/thd.h>
#include <grpc/support/time.h>
#include <grpc/support/tls.h>
#include <grpc/support/tls_msvc.h>
#include <grpc/support/useful.h>
int main(int argc, char **argv) {

Loading…
Cancel
Save