[Libreoffice-commits] .: 2 commits - bridges/Module_bridges.mk

[Libreoffice Gerrit user]

 bridges/Module_bridges.mk |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c994ab6d9241f88784c5f1350bbaae71d62a4476
Author: David Tardon <dtar...@redhat.com>
Date:   Sun Sep 23 07:20:58 2012 +0200

    there must always be a bridge built
    
    Change-Id: Ie5bc8a27feed65126bd8bfceff2903029cd20059

diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 25f1cca..dbce0fa 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -92,4 +92,8 @@ $(eval $(call gb_Module_add_targets,bridges,\
        ) \
 ))
 
+ifeq ($(strip $(bridges_SELECTED_BRIDGE)),)
+$(call gb_Output_error,no bridge selected for build: bailing out)
+endif
+
 # vim: set noet sw=4 ts=4:
commit b944750a23be73f1cd68c935cece5c28be030a37
Author: David Tardon <dtar...@redhat.com>
Date:   Sun Sep 23 07:17:29 2012 +0200

    fix more copy&pasted conditions selecting bridge to build
    
    Change-Id: Icffcd0733e030b565e3f78f6fff7467a10347f52

diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index ece44ed..25f1cca 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -39,13 +39,13 @@ $(eval $(call gb_Module_add_targets,bridges,\
        $(if $(filter GCCLINUXH,$(COM)$(OS)$(CPU)),\
                Library_gcc3_linux_hppa \
        ) \
-       $(if $(filter GCCLINUXA,$(COM)$(OS)$(CPU)$(CPUNAME)),\
+       $(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)$(CPUNAME)),\
+       $(if $(filter GCCLINUX6,$(COM)$(OS)$(CPU)),\
                Library_gcc3_linux_m68k \
        ) \
        $(if $(and $(filter GCCM,$(COM)$(CPU)),$(filter ANDROID LINUX,$(OS))),\
@@ -75,7 +75,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
        $(if $(filter GCCMACOSXP,$(COM)$(OS)$(CPU)),\
                Library_gcc3_macosx_powerpc \
        ) \
-       $(if $(filter GCCSOLARISI,$(COM)$(OS)$(CPU)$(CPUNAME)),\
+       $(if $(filter GCCSOLARISI,$(COM)$(OS)$(CPU)),\
                Library_gcc3_solaris_intel \
        ) \
        $(if $(filter GCCSOLARISS,$(COM)$(OS)$(CPU)),\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits