aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--build.json3
-rwxr-xr-xtools/run_tests/jobset.py1
-rw-r--r--tools/run_tests/sources_and_headers.json5
-rw-r--r--vsprojects/Grpc.mak4
5 files changed, 8 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index f7ace3186a..15e05a5d87 100644
--- a/Makefile
+++ b/Makefile
@@ -7135,14 +7135,14 @@ $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: openssl_dep_error
else
-$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
+$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS)
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
- $(Q) $(LD) $(LDFLAGS) $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters
+ $(Q) $(LD) $(LDFLAGS) $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters
endif
-$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o: $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
+$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o:
deps_gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep)
ifneq ($(NO_SECURE),true)
diff --git a/build.json b/build.json
index c6a670970b..b784fe3303 100644
--- a/build.json
+++ b/build.json
@@ -1150,8 +1150,7 @@
"src": [
"tools/codegen/core/gen_legal_metadata_characters.c"
],
- "deps": [
- ]
+ "deps": []
},
{
"name": "gpr_cmdline_test",
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index 538deac0e3..d0e3fc4eb3 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -174,6 +174,7 @@ class Job(object):
for k, v in add_env.iteritems():
env[k] = v
self._start = time.time()
+ print spec.cmdline
self._process = subprocess.Popen(args=spec.cmdline,
stderr=subprocess.STDOUT,
stdout=self._tempfile,
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 142c84901d..aa22f0f159 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -238,10 +238,7 @@
]
},
{
- "deps": [
- "gpr",
- "grpc"
- ],
+ "deps": [],
"headers": [],
"language": "c",
"name": "gen_legal_metadata_characters",
diff --git a/vsprojects/Grpc.mak b/vsprojects/Grpc.mak
index 3d853d9c76..9eede74b08 100644
--- a/vsprojects/Grpc.mak
+++ b/vsprojects/Grpc.mak
@@ -183,10 +183,10 @@ gen_hpack_tables: gen_hpack_tables.exe
echo Running gen_hpack_tables
$(OUT_DIR)\gen_hpack_tables.exe
-gen_legal_metadata_characters.exe: build_gpr build_grpc $(OUT_DIR)
+gen_legal_metadata_characters.exe: $(OUT_DIR)
echo Building gen_legal_metadata_characters
$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\tools\codegen\core\gen_legal_metadata_characters.c
- $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_legal_metadata_characters.exe" Debug\gpr.lib Debug\grpc.lib $(LIBS) $(OUT_DIR)\gen_legal_metadata_characters.obj
+ $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_legal_metadata_characters.exe" $(LIBS) $(OUT_DIR)\gen_legal_metadata_characters.obj
gen_legal_metadata_characters: gen_legal_metadata_characters.exe
echo Running gen_legal_metadata_characters
$(OUT_DIR)\gen_legal_metadata_characters.exe