diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-04-21 12:33:08 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-04-21 13:38:48 +0200 |
| commit | 14ae8765927070a3c7558fba921c26cce35935dd (patch) | |
| tree | 77d3a868a3a457efd9a25e7438f0245d20077adc /solenv/gbuild/LinkTarget.mk | |
| parent | ee54206dfc747caede9368556f7492a55dcd9286 (diff) | |
CLANG_C -> CLANG_CC
Change-Id: I50ed05116df3f295af6406f0ee45610d9e1e031e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92619
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 0cb81a0a1daa..287948b12a72 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -240,7 +240,7 @@ else $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.c,$(true),$(if $(COMPILER_TEST),C? ,C ),3) $(call gb_Trace_StartRange,$*.c,$(if $(COMPILER_TEST),C? ,C )) - $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_C)) + $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CC)) $(call gb_Trace_EndRange,$*.c,$(if $(COMPILER_TEST),C? ,C )) endif @@ -328,7 +328,7 @@ $(call gb_GenCObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET) $(call gb_Output_announce,$*.c,$(true),C ,3) $(call gb_Trace_StartRange,$*.c,C ) test -f $(call gb_GenCObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenCObject_get_source,$*)" && false) - $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_C)) + $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CC)) $(call gb_Trace_EndRange,$*.c,C ) ifeq ($(gb_FULLDEPS),$(true)) @@ -836,7 +836,7 @@ $(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_CODE := $(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := $(call gb_LinkTarget_get_target,$(1)) : COMPILER_TEST := $(call gb_LinkTarget_get_target,$(1)) : T_SYMBOLS := $(if $(call gb_LinkTarget__symbols_enabled,$(2)),$(true),$(false)) -$(call gb_LinkTarget_get_target,$(1)) : T_C := +$(call gb_LinkTarget_get_target,$(1)) : T_CC := $(call gb_LinkTarget_get_target,$(1)) : T_CXX := ifeq ($(gb_FULLDEPS),$(true)) @@ -1787,7 +1787,7 @@ endef # C/C++ files will be build with Clang (if possible) instead of the default compiler. # call gb_LinkTarget_use_clang,linktarget,,linktargetmakefilename define gb_LinkTarget_use_clang -$(call gb_LinkTarget_get_target,$(1)) : T_C := $(CLANG_C) +$(call gb_LinkTarget_get_target,$(1)) : T_CC := $(CLANG_CC) $(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(CLANG_CXX) endef |