solenv/gbuild/platform/com_MSC_class.mk | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 127250edb6d613a2425fe303bc6cdb9fa2c3b99c
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Oct 3 13:34:35 2019 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Oct 4 08:57:56 2019 +0200
common gbuild function for getting the correct windows compiler
Change-Id: Ia4001a4a3a0ac8490ab7104a25ccd688d18b8aa1
Reviewed-on: https://gerrit.libreoffice.org/80122
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index ddb55a67d07d..adbbfe126ae2 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -34,16 +34,21 @@ endef
# CObject class
+# $(call gb_CObject__compiler,flags,source)
+define gb_CObject__compiler
+ $(if $(filter YES,$(LIBRARY_X64)), $(CXX_X64_BINARY), \
+ $(if $(filter YES,$(PE_X86)), $(CXX_X86_BINARY), \
+ $(if $(filter %.c,$(2)), $(gb_CC), \
+ $(if $(filter -clr,$(1)), \
+ $(MSVC_CXX)
-I$(SRCDIR)/solenv/clang-cl,$(gb_CXX)))))
+endef
+
# $(call
gb_CObject__command_pattern,object,flags,source,dep-file,compiler-plugins,symbols)
define gb_CObject__command_pattern
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
- $(if $(filter YES,$(LIBRARY_X64)), $(CXX_X64_BINARY), \
- $(if $(filter YES,$(PE_X86)), $(CXX_X86_BINARY), \
- $(if $(filter %.c,$(3)), $(gb_CC), \
- $(if $(filter -clr,$(2)), \
- $(MSVC_CXX)
-I$(SRCDIR)/solenv/clang-cl,$(gb_CXX))))) \
+ $(call gb_CObject__compiler,$(2),$(3)) \
$(DEFS) \
$(gb_LTOFLAGS) \
$(if $(WARNINGS_DISABLED),$(call
gb_Helper_disable_warnings,$(2)),$(2)) \
@@ -81,7 +86,7 @@ $(call gb_Output_announce,$(2),$(true),PCH,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(call
gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \
unset INCLUDE && \
- $(gb_CXX) \
+ $(call gb_CObject__compiler,$(4) $(5),$(3)) \
$(if $(WARNINGS_DISABLED),$(call
gb_Helper_disable_warnings,$(4) $(5)),$(4) $(5)) \
-Fd$(PDBFILE) \
$(if $(EXTERNAL_CODE),$(if
$(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
