diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-17 11:10:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-17 11:10:13 +0100 |
| commit | 439a3c036b1f40b3b3a7600e5a64879c22074771 (patch) | |
| tree | 652ec055c09b46c27d619397e6bc54c09f184aa7 /solenv | |
| parent | 401d07f31fde6992125b498fc2ac798a6523ca26 (diff) | |
Have a specific TARGETTYPE for CompilerTest after all
...instead of leaving it empty. (645583dfd374c8b02f3c0eeba6233a0bb5884d68 "New
compilerplugins/clang unit tests": "Checking the input files is implicitly
phony, as the compilation step doesn't generate any object files, and the link
step does nothing because there is no gb_LinkTarget_set_targettype for
CompilerTest.") In preparation for using compilerplugins/clang with clang-cl on
Windows.
Change-Id: Ica4f16a4b249537f78ce21fcbe7c4afea8214821
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CompilerTest.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/CompilerTest.mk b/solenv/gbuild/CompilerTest.mk index 674ec9389d08..8a1ba58717e0 100644 --- a/solenv/gbuild/CompilerTest.mk +++ b/solenv/gbuild/CompilerTest.mk @@ -15,6 +15,7 @@ endef # call gb_CompilerTest__CompilerTest_impl,compilertest,linktarget define gb_CompilerTest__CompilerTest_impl $(call gb_LinkTarget_LinkTarget,$(2),CompilerTest_$(1),NONE) +$(call gb_LinkTarget_set_targettype,$(2),CompilerTest) $(call gb_LinkTarget_get_target,$(2)): COMPILER_TEST := $(true) $(call gb_LinkTarget_get_target,$(2)): ENABLE_WERROR := $(true) $(call gb_CompilerTest_get_target,$(1)): $(call gb_LinkTarget_get_target,$(2)) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index f54ace62c1d8..eb9ee12039df 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -488,7 +488,8 @@ define gb_LinkTarget__command_impl $(call gb_LinkTarget__command,$(1),$(2)),\ mkdir -p $(dir $(1)) && echo invalid - merged lib > $(1) \ $(if $(SOVERSIONSCRIPT),&& echo invalid - merged lib > $(WORKDIR)/LinkTarget/$(2))),\ - $(call gb_LinkTarget__command,$(1),$(2))) + $(if $(filter-out CompilerTest,$(TARGETTYPE)), \ + $(call gb_LinkTarget__command,$(1),$(2)))) $(call gb_LinkTarget__command_objectlist,$(WORKDIR)/LinkTarget/$(2).objectlist) endef |