[Libreoffice-commits] core.git: solenv/gbuild

Stephan Bergmann sbergman at redhat.com
Thu Dec 18 23:53:21 PST 2014


 solenv/gbuild/platform/com_GCC_class.mk |    1 +
 solenv/gbuild/platform/com_MSC_class.mk |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 9c928971167b6fc553f105b8141e214e6d06785f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 19 08:51:55 2014 +0100

    Blind attempt to fix PCH
    
    ...after 86ba184394094c7c043a505a20a0b1b8977f73d7 "Introduce
    gb_*_set_external_code"
    
    Change-Id: I6ed9652c6157b7cb2196f044f62c606968ef1807

diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 59678bb..0ce02d6 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -171,6 +171,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(4) $(5) \
 		$(gb_COMPILERDEPFLAGS) \
 		$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
+		$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
 		$(6) \
 		$(call gb_cxx_dep_generation_options,$(1),$(call gb_PrecompiledHeader_get_dep_target,$(2))) \
 		-c $(patsubst %.cxx,%.hxx,$(3)) \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 92b6e2b..4064527 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -79,6 +79,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
+		$(if $(EXTERNAL_CODE),,$(gb_DEFS_INTERNAL)) \
 		$(gb_LTOFLAGS) \
 		$(gb_COMPILERDEPFLAGS) \
 		-I$(dir $(3)) \


More information about the Libreoffice-commits mailing list