[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

[Stephan Bergmann]

 bridges/Library_cpp_uno.mk |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 94b2fe9b00c28e12bbd98ade8c5a31179c290da0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 23 10:54:19 2014 +0200

    fdo#71000: Fix SOLARIS-INTEL case
    
    Thanks to Dagobert Michelsen for noticing.
    
    Change-Id: Ife333e74c145ad71c451cb60ba9a8ee4222a2183

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index c6ab9a0..d929c86 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -63,6 +63,9 @@ else ifeq ($(OS),MACOSX)
 bridges_SELECTED_BRIDGE := gcc3_macosx_intel
 bridge_asm_objects := call
 bridge_exception_objects := cpp2uno except uno2cpp
+else ifeq ($(OS),SOLARIS)
+bridges_SELECTED_BRIDGE := gcc3_solaris_intel
+bridge_exception_objects := cpp2uno except uno2cpp
 else ifeq ($(COM),MSC)
 bridges_SELECTED_BRIDGE := msvc_win32_intel
 bridge_exception_objects := cpp2uno dllinit uno2cpp
@@ -145,11 +148,6 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
 bridge_noopt_objects := uno2cpp
 bridge_exception_objects := cpp2uno except
 
-else ifeq ($(OS)-$(CPUNAME),SOLARIS-INTEL)
-
-bridges_SELECTED_BRIDGE := gcc3_solaris_intel
-bridge_exception_objects := cpp2uno except uno2cpp
-
 else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
 
 bridges_SELECTED_BRIDGE := gcc3_solaris_sparc