Makefile.in | 6 ++++--
bridges/Library_cpp_uno.mk | 3 ++-
solenv/gbuild/platform/com_GCC_class.mk | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit d72b4106e2b1525f76ea4d91458204aeec8b408e
Author: Peter Foley <pefol...@verizon.net>
Date: Sun Mar 24 10:20:09 2013 -0400
make bridges work with clang on x64 linux
Change-Id: Idf5c7586e375f0321c765d165f9698403b7a7daf
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 12275f5..987517d 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -130,7 +130,8 @@ else ifeq ($(CPU),X)
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
bridge_asm_objects := call
-bridge_exception_objects := abi callvirtualmethod cpp2uno except uno2cpp
+bridge_noopt_objects := callvirtualmethod
+bridge_exception_objects := abi cpp2uno except uno2cpp
else ifeq ($(OS),MACOSX)
bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64
bridge_exception_objects := abi call callvirtualmethod cpp2uno except uno2cpp
diff --git a/solenv/gbuild/platform/com_GCC_class.mk
b/solenv/gbuild/platform/com_GCC_class.mk
index 6d068d7..c8a8d33 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -44,6 +44,7 @@ $(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
+ -x assembler-with-cpp \
$(gb_LTOFLAGS) \
$(gb_AFLAGS) \
-c $(3) \
commit 96f943045af9068d1e6b5453836eccdbc140e677
Author: Peter Foley <pefol...@verizon.net>
Date: Sun Mar 24 09:34:55 2013 -0400
match gbuild rules that contain a slash
Change-Id: Id50d89114a7569a9c7429204ce73217cf7a4c131
diff --git a/Makefile.in b/Makefile.in
index 0ae475a..626c726 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,7 +88,9 @@ define gbuild_modules_rules
$(foreach m,$(1),$(call gbuild_module_rules,$(m)))
endef
-$(eval $(call gbuild_modules_rules,$(filter-out Module%,$(subst /, ,$(subst
$(SRCDIR)/,,$(wildcard $(SRCDIR)/*/Module_*.mk))))))
+gbuild_modules := $(filter-out Module%,$(subst /, ,$(subst
$(SRCDIR)/,,$(wildcard $(SRCDIR)/*/Module_*.mk))))
+
+$(eval $(call gbuild_modules_rules,$(gbuild_modules)))
gbuild_TARGETS := AllLangHelp \
AllLangResTarget \
@@ -124,7 +126,7 @@ gbuild_TARGETS := AllLangHelp \
WinResTarget \
Zip
# build a generic gbuild target
-$(foreach target,$(gbuild_TARGETS),$(target)_%):
+$(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach
module,$(gbuild_modules),$(target)_$(module)/%)):
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild $@
#
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
