summaryrefslogtreecommitdiffstats
path: root/bridges/Module_bridges.mk
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-14 21:21:28 -0400
committerTor Lillqvist <tml@iki.fi>2013-03-18 07:53:21 +0000
commita1fbebff263f65bc25c0c955da2e68e90cd2bb03 (patch)
treede1a32ca8c73f256364160a829b89143e8a041a0 /bridges/Module_bridges.mk
parentcoverity#736014 Using invalid iterator (diff)
downloadcore-a1fbebff263f65bc25c0c955da2e68e90cd2bb03.tar.gz
core-a1fbebff263f65bc25c0c955da2e68e90cd2bb03.zip
Cleanup bridges module
Reduce excessive copy-pasting Remove bridges for C50 and C52 compilers which aren't in configure any more Prevent LTO from being used in the bridges module because it causes crashes Change-Id: I7ff85c2e8d6ff89c5acd48aea415e0960b3ef812 Reviewed-on: https://gerrit.libreoffice.org/2765 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'bridges/Module_bridges.mk')
-rw-r--r--bridges/Module_bridges.mk87
1 files changed, 8 insertions, 79 deletions
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index c1dbcef16bd8..f9d9c14f9321 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -10,95 +10,24 @@
$(eval $(call gb_Module_Module,bridges))
$(eval $(call gb_Module_add_targets,bridges,\
+ Library_cpp_uno \
$(if $(filter TRUE,$(SOLAR_JAVA)),\
Jar_java_uno \
Library_java_uno \
) \
- $(if $(and $(filter I,$(CPU)),$(filter C50 C52,$(COM))),\
- Library_cc50_solaris_intel \
- ) \
- $(if $(filter C52S,$(COM)$(CPU)),\
- Library_cc50_solaris_sparc \
- ) \
- $(if $(filter C52U,$(COM)$(CPU)),\
- Library_cc5_solaris_sparc64 \
- ) \
- $(if $(filter GCCAIXP,$(COM)$(OS)$(CPU)),\
- Library_gcc3_aix_powerpc \
- ) \
- $(if $(filter GCCIOSR,$(COM)$(OS)$(CPU)),\
- CustomTarget_gcc3_ios_arm \
- Library_gcc3_ios_arm \
- ) \
- $(if $(filter GCCLINUXL,$(COM)$(OS)$(CPU)),\
- Library_gcc3_linux_alpha \
- ) \
- $(if $(and $(filter GCCR,$(COM)$(CPU)),$(filter ANDROID LINUX,$(OS))),\
- CustomTarget_gcc3_linux_arm \
- Library_gcc3_linux_arm \
- ) \
- $(if $(filter GCCLINUXH,$(COM)$(OS)$(CPU)),\
- Library_gcc3_linux_hppa \
- ) \
- $(if $(filter GCCLINUXA,$(COM)$(OS)$(CPU)),\
- Library_gcc3_linux_ia64 \
- ) \
- $(if $(and $(filter GCCI,$(COM)$(CPU)),$(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS))),\
- Library_gcc3_linux_intel \
- ) \
- $(if $(filter GCCLINUX6,$(COM)$(OS)$(CPU)),\
- Library_gcc3_linux_m68k \
- ) \
- $(if $(and $(filter GCCM,$(COM)$(CPU)),$(filter ANDROID LINUX,$(OS))),\
- Library_gcc3_linux_mips \
- ) \
- $(if $(filter GCCLINUXPPOWERPC64,$(COM)$(OS)$(CPU)$(CPUNAME)),\
- Library_gcc3_linux_powerpc64 \
- ) \
- $(if $(filter GCCLINUXPPOWERPC,$(COM)$(OS)$(CPU)$(CPUNAME)),\
- Library_gcc3_linux_powerpc \
- ) \
- $(if $(filter GCCLINUX3S390,$(COM)$(OS)$(CPU)$(CPUNAME)),\
- Library_gcc3_linux_s390 \
- ) \
- $(if $(filter GCCLINUX3S390X,$(COM)$(OS)$(CPU)$(CPUNAME)),\
- Library_gcc3_linux_s390x \
- ) \
- $(if $(filter GCCLINUXS,$(COM)$(OS)$(CPU)),\
- Library_gcc3_linux_sparc \
- ) \
- $(if $(and $(filter GCCX,$(COM)$(CPU)),$(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS))),\
- Library_gcc3_linux_x86-64 \
- ) \
- $(if $(filter GCCMACOSXI,$(COM)$(OS)$(CPU)),\
- Library_gcc3_macosx_intel \
- ) \
- $(if $(filter GCCMACOSXX,$(COM)$(OS)$(CPU)),\
- Library_gcc3_macosx_x86-64 \
- ) \
- $(if $(filter GCCMACOSXP,$(COM)$(OS)$(CPU)),\
- Library_gcc3_macosx_powerpc \
- ) \
- $(if $(filter GCCSOLARISI,$(COM)$(OS)$(CPU)),\
- Library_gcc3_solaris_intel \
- ) \
- $(if $(filter GCCSOLARISS,$(COM)$(OS)$(CPU)),\
- Library_gcc3_solaris_sparc \
- ) \
- $(if $(filter WNTGCC,$(OS)$(COM)),\
- Library_mingw_intel \
- ) \
- $(if $(filter MSCI,$(COM)$(CPU)),\
- Library_msvc_win32_intel \
- ) \
- $(if $(filter MSCX,$(COM)$(CPU)),\
- Library_msvc_win32_x86-64 \
+ $(if $(filter R,$(CPU)),\
+ $(if $(filter IOS,$(OS)),\
+ CustomTarget_gcc3_ios_arm) \
+ $(if $(filter ANDROID LINUX,$(OS)),\
+ CustomTarget_gcc3_linux_arm) \
) \
))
ifeq (,$(gb_STRIPPED_BUILD))
ifeq ($(strip $(bridges_SELECTED_BRIDGE)),)
$(call gb_Output_error,no bridge selected for build: bailing out)
+else ifneq ($(words $(bridges_SELECTED_BRIDGE)),1)
+$(call gb_Output_error,multiple bridges selected for build: $(bridges_SELECTED_BRIDGE))
endif
endif